replace query and querySelector

BUG=

Review URL: https://chromiumcodereview.appspot.com//100633003