Simplify ExecuteJavaScript* functions.

chrome/test/base/ui_test_utils.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/base/ui_test_utils.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 548 matching lines @@
         desired_size);
     message_loop_runner_ = new content::MessageLoopRunner;
     message_loop_runner_->Run();
     return snapshot_taken_;
   }
 
   bool TakeEntirePageSnapshot(RenderViewHost* rvh,
                               SkBitmap* bitmap) WARN_UNUSED_RESULT {
     const char* script =
         "window.domAutomationController.send("
-            "JSON.stringify([document.width, document.height]))";
+        "    JSON.stringify([document.width, document.height]))";
     std::string json;
-    if (!content::ExecuteJavaScriptAndExtractString(rvh, "", script, &json))
+    if (!content::ExecuteScriptAndExtractString(rvh, script, &json))
       return false;
 
     // Parse the JSON.
     std::vector<int> dimensions;
     scoped_ptr<Value> value(
         base::JSONReader::Read(json, base::JSON_ALLOW_TRAILING_COMMAS));
     if (!value->IsType(Value::TYPE_LIST))
       return false;
     ListValue* list = static_cast<ListValue*>(value.get());
     int width, height;
@@ skipping 122 matching lines @@
 void HistoryEnumerator::HistoryQueryComplete(
     const base::Closure& quit_task,
     HistoryService::Handle request_handle,
     history::QueryResults* results) {
   for (size_t i = 0; i < results->size(); ++i)
     urls_.push_back((*results)[i].url());
   quit_task.Run();
 }
 
 }  // namespace ui_test_utils