Reland "Add ExecuteJavaScriptForTest and make all tests use it"

chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.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/net_internals/net_internals_ui_browsertest.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 230 matching lines @@
       NEW_BACKGROUND_TAB,
       ui_test_utils::BROWSER_TEST_NONE);
 }
 
 void NetInternalsTest::MessageHandler::NavigateToPrerender(
     const base::ListValue* list_value) {
   std::string url;
   ASSERT_TRUE(list_value->GetString(0, &url));
   content::RenderFrameHost* frame =
       browser()->tab_strip_model()->GetWebContentsAt(1)->GetMainFrame();
-  frame->ExecuteJavaScript(
+  frame->ExecuteJavaScriptForTests(
       base::ASCIIToUTF16(base::StringPrintf("Click('%s')", url.c_str())));
 }
 
 void NetInternalsTest::MessageHandler::CreateIncognitoBrowser(
     const base::ListValue* list_value) {
   ASSERT_FALSE(incognito_browser_);
   incognito_browser_ = net_internals_test_->CreateIncognitoBrowser();
 
   // Tell the test harness that creation is complete.
   base::StringValue command_value("onIncognitoBrowserCreatedForTest");
@@ skipping 103 matching lines @@
   if (test_server_started_)
     return true;
   test_server_started_ = test_server()->Start();
 
   // Sample domain for SDCH-view test. Dictionaries for localhost/127.0.0.1
   // are forbidden.
   host_resolver()->AddRule("testdomain.com", "127.0.0.1");
   host_resolver()->AddRule("sub.testdomain.com", "127.0.0.1");
   return test_server_started_;
 }