Add ExecuteJavaScriptForTest and make all tests use it

chrome/browser/ui/webui/web_ui_test_handler.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/browser/ui/webui/web_ui_test_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 19 matching lines @@
 }
 
 void WebUITestHandler::PreloadJavaScript(const base::string16& js_text,
                                          RenderViewHost* preload_host) {
   DCHECK(preload_host);
   preload_host->Send(new ChromeViewMsg_WebUIJavaScript(
       preload_host->GetRoutingID(), js_text));
 }
 
 void WebUITestHandler::RunJavaScript(const base::string16& js_text) {
-  web_ui()->GetWebContents()->GetMainFrame()->ExecuteJavaScript(js_text);
+  web_ui()->GetWebContents()->GetMainFrame()->ExecuteJavaScriptForTests(
+      js_text);
 }
 
 bool WebUITestHandler::RunJavaScriptTestWithResult(
     const base::string16& js_text) {
   test_succeeded_ = false;
   run_test_succeeded_ = false;
   content::RenderFrameHost* frame = web_ui()->GetWebContents()->GetMainFrame();
-  frame->ExecuteJavaScript(js_text,
-                           base::Bind(&WebUITestHandler::JavaScriptComplete,
-                                      base::Unretained(this)));
+  frame->ExecuteJavaScriptForTests(
+      js_text, base::Bind(&WebUITestHandler::JavaScriptComplete,
+                          base::Unretained(this)));
   return WaitForResult();
 }
 
 void WebUITestHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("testResult",
       base::Bind(&WebUITestHandler::HandleTestResult, base::Unretained(this)));
 }
 
 void WebUITestHandler::HandleTestResult(const base::ListValue* test_result) {
   // Quit the message loop if |is_waiting_| so waiting process can get result or
@@ skipping 45 matching lines @@
   // complete.
   if (!run_test_done_ || (run_test_succeeded_ && !test_done_)) {
     content::RunMessageLoop();
   }
 
   is_waiting_ = false;
 
   // To succeed the test must execute as well as pass the test.
   return run_test_succeeded_ && test_succeeded_;
 }