Revert of Add ExecuteJavaScriptForTest and make all tests use it

chrome/browser/errorpage_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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 603 matching lines @@
       browser()->tab_strip_model()->GetActiveWebContents();
 
   // Do a search and make sure the browser ends up at the right page.
   content::TestNavigationObserver nav_observer(web_contents, 1);
   content::TitleWatcher title_watcher(
       web_contents,
       base::ASCIIToUTF16("Title Of More Awesomeness"));
   // Can't use content::ExecuteScript because it waits for scripts to send
   // notification that they've run, and scripts that trigger a navigation may
   // not send that notification.
-  web_contents->GetMainFrame()->ExecuteJavaScriptForTests(
+  web_contents->GetMainFrame()->ExecuteJavaScript(
       base::ASCIIToUTF16("document.getElementById('search-button').click();"));
   nav_observer.Wait();
   EXPECT_EQ(base::ASCIIToUTF16("Title Of More Awesomeness"),
             title_watcher.WaitAndGetTitle());
 
   // There should have been another Link Doctor request, for tracking purposes.
   // Have to wait for it, since the search page does not depend on having
   // sent the tracking request.
   link_doctor_interceptor()->WaitForRequests(2);
   EXPECT_EQ(2, link_doctor_interceptor()->num_requests());
@@ skipping 24 matching lines @@
 
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   // Clicking the reload button should load the error page again, and there
   // should be two commits, as before.
   content::TestNavigationObserver nav_observer(web_contents, 2);
   // Can't use content::ExecuteScript because it waits for scripts to send
   // notification that they've run, and scripts that trigger a navigation may
   // not send that notification.
-  web_contents->GetMainFrame()->ExecuteJavaScriptForTests(
+  web_contents->GetMainFrame()->ExecuteJavaScript(
       base::ASCIIToUTF16("document.getElementById('reload-button').click();"));
   nav_observer.Wait();
   ExpectDisplayingNavigationCorrections(browser(), net::ERR_NAME_NOT_RESOLVED);
 
   // There should have two more requests to the correction service:  One for the
   // new error page, and one for tracking purposes.  Have to make sure to wait
   // for the tracking request, since the new error page does not depend on it.
   link_doctor_interceptor()->WaitForRequests(3);
   EXPECT_EQ(3, link_doctor_interceptor()->num_requests());
 }
@@ skipping 12 matching lines @@
 
   // Simulate a click on a link.
 
   content::TitleWatcher title_watcher(
       web_contents,
       base::ASCIIToUTF16("Title Of Awesomeness"));
   std::string link_selector =
       "document.querySelector('a[href=\"http://mock.http/title2.html\"]')";
   // The tracking request is triggered by onmousedown, so it catches middle
   // mouse button clicks, as well as left clicks.
-  web_contents->GetMainFrame()->ExecuteJavaScriptForTests(
+  web_contents->GetMainFrame()->ExecuteJavaScript(
       base::ASCIIToUTF16(link_selector + ".onmousedown();"));
   // Can't use content::ExecuteScript because it waits for scripts to send
   // notification that they've run, and scripts that trigger a navigation may
   // not send that notification.
-  web_contents->GetMainFrame()->ExecuteJavaScriptForTests(
+  web_contents->GetMainFrame()->ExecuteJavaScript(
       base::ASCIIToUTF16(link_selector + ".click();"));
   EXPECT_EQ(base::ASCIIToUTF16("Title Of Awesomeness"),
             title_watcher.WaitAndGetTitle());
 
   // There should have been a tracking request to the correction service.  Have
   // to make sure to wait the tracking request, since the new page does not
   // depend on it.
   link_doctor_interceptor()->WaitForRequests(2);
   EXPECT_EQ(2, link_doctor_interceptor()->num_requests());
 }
@@ skipping 65 matching lines @@
   EXPECT_EQ(2, wc->GetController().GetEntryCount());
 
   std::string script = "var frame = document.createElement('iframe');"
                        "frame.src = '" + fail_url.spec() + "';"
                        "document.body.appendChild(frame);";
   {
     TestFailProvisionalLoadObserver fail_observer(wc);
     content::WindowedNotificationObserver load_observer(
         content::NOTIFICATION_LOAD_STOP,
         content::Source<NavigationController>(&wc->GetController()));
-    wc->GetMainFrame()->ExecuteJavaScriptForTests(base::ASCIIToUTF16(script));
+    wc->GetMainFrame()->ExecuteJavaScript(base::ASCIIToUTF16(script));
     load_observer.Wait();
 
     // Ensure we saw the expected failure.
     EXPECT_EQ(fail_url, fail_observer.fail_url());
 
     // Failed initial navigation of an iframe shouldn't be adding any history
     // entries.
     EXPECT_EQ(2, wc->GetController().GetEntryCount());
   }
 
   // Do the same test, but with an iframe that doesn't have initial URL
   // assigned.
   script = "var frame = document.createElement('iframe');"
            "frame.id = 'target_frame';"
            "document.body.appendChild(frame);";
   {
     content::WindowedNotificationObserver load_observer(
         content::NOTIFICATION_LOAD_STOP,
         content::Source<NavigationController>(&wc->GetController()));
-    wc->GetMainFrame()->ExecuteJavaScriptForTests(base::ASCIIToUTF16(script));
+    wc->GetMainFrame()->ExecuteJavaScript(base::ASCIIToUTF16(script));
     load_observer.Wait();
   }
 
   script = "var f = document.getElementById('target_frame');"
            "f.src = '" + fail_url.spec() + "';";
   {
     TestFailProvisionalLoadObserver fail_observer(wc);
     content::WindowedNotificationObserver load_observer(
         content::NOTIFICATION_LOAD_STOP,
         content::Source<NavigationController>(&wc->GetController()));
-    wc->GetMainFrame()->ExecuteJavaScriptForTests(base::ASCIIToUTF16(script));
+    wc->GetMainFrame()->ExecuteJavaScript(base::ASCIIToUTF16(script));
     load_observer.Wait();
 
     EXPECT_EQ(fail_url, fail_observer.fail_url());
     EXPECT_EQ(2, wc->GetController().GetEntryCount());
   }
   EXPECT_EQ(0, link_doctor_interceptor()->num_requests());
 }
 
 // Checks that navigation corrections are not loaded when we receive an actual
 // 404 page.
@@ skipping 158 matching lines @@
 
   EXPECT_EQ(2, interceptor()->failures());
   EXPECT_EQ(2, interceptor()->requests());
 
   ToggleHelpBox(browser());
   EXPECT_TRUE(IsDisplayingText(browser(), "error.page.auto.reload"));
 
   content::WebContents* web_contents =
     browser()->tab_strip_model()->GetActiveWebContents();
   content::TestNavigationObserver nav_observer(web_contents, 1);
-  web_contents->GetMainFrame()->ExecuteJavaScriptForTests(
+  web_contents->GetMainFrame()->ExecuteJavaScript(
       base::ASCIIToUTF16("document.getElementById('reload-button').click();"));
   nav_observer.Wait();
   EXPECT_FALSE(IsDisplayingText(browser(), "error.page.auto.reload"));
 }
 
 // Interceptor that fails all requests with net::ERR_ADDRESS_UNREACHABLE.
 class AddressUnreachableInterceptor : public net::URLRequestInterceptor {
  public:
   AddressUnreachableInterceptor() {}
   ~AddressUnreachableInterceptor() override {}
@@ skipping 207 matching lines @@
   ui_test_utils::NavigateToURL(
       browser(),
       URLRequestFailedJob::GetMockHttpUrlForHostname(net::ERR_UNSAFE_PORT,
                                                      kHostname));
 
   ToggleHelpBox(browser());
   EXPECT_TRUE(IsDisplayingText(browser(), kHostnameJSUnicode));
 }
 
 }  // namespace