Revert of Add ExecuteJavaScriptForTest and make all tests use it

chrome/browser/prerender/prerender_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 <deque>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 1245 matching lines @@
 
   void OpenDestURLViaWindowOpen() const {
     OpenURLViaWindowOpen(dest_url_);
   }
 
   void OpenURLViaWindowOpen(const GURL& url) const {
     OpenURLWithJSImpl("WindowOpen", url, GURL(), true);
   }
 
   void RemoveLinkElement(int i) const {
-    GetActiveWebContents()->GetMainFrame()->ExecuteJavaScriptForTests(
+    GetActiveWebContents()->GetMainFrame()->ExecuteJavaScript(
         base::ASCIIToUTF16(base::StringPrintf("RemoveLinkElement(%d)", i)));
   }
 
   void ClickToNextPageAfterPrerender() {
     TestNavigationObserver nav_observer(GetActiveWebContents());
     RenderFrameHost* render_frame_host = GetActiveWebContents()->GetMainFrame();
-    render_frame_host->ExecuteJavaScriptForTests(
-        base::ASCIIToUTF16("ClickOpenLink()"));
+    render_frame_host->ExecuteJavaScript(base::ASCIIToUTF16("ClickOpenLink()"));
     nav_observer.Wait();
   }
 
   void NavigateToNextPageAfterPrerender() const {
     ui_test_utils::NavigateToURL(
         current_browser(),
         test_server()->GetURL("files/prerender/prerender_page.html"));
   }
 
   // Called after the prerendered page has been navigated to and then away from.
@@ skipping 237 matching lines @@
 
   scoped_ptr<TestPrerender> ExpectPrerender(FinalStatus expected_final_status) {
     return prerender_contents_factory_->ExpectPrerenderContents(
         expected_final_status);
   }
 
   void AddPrerender(const GURL& url, int index) {
     std::string javascript = base::StringPrintf(
         "AddPrerender('%s', %d)", url.spec().c_str(), index);
     RenderFrameHost* render_frame_host = GetActiveWebContents()->GetMainFrame();
-    render_frame_host->ExecuteJavaScriptForTests(
-        base::ASCIIToUTF16(javascript));
+    render_frame_host->ExecuteJavaScript(base::ASCIIToUTF16(javascript));
   }
 
   // Returns a string for pattern-matching TaskManager tab entries.
   base::string16 MatchTaskManagerTab(const char* page_title) {
     return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_TAB_PREFIX,
                                       base::ASCIIToUTF16(page_title));
   }
 
   // Returns a string for pattern-matching TaskManager prerender entries.
   base::string16 MatchTaskManagerPrerender(const char* page_title) {
@@ skipping 129 matching lines @@
         url.spec().c_str(), ping_url.spec().c_str());
 
     if (new_web_contents) {
       NewTabNavigationOrSwapObserver observer;
       render_frame_host->ExecuteJavaScriptWithUserGestureForTests(
           base::ASCIIToUTF16(javascript));
       observer.Wait();
     } else {
       NavigationOrSwapObserver observer(current_browser()->tab_strip_model(),
                                         web_contents);
-      render_frame_host->ExecuteJavaScriptForTests(
-          base::ASCIIToUTF16(javascript));
+      render_frame_host->ExecuteJavaScript(base::ASCIIToUTF16(javascript));
       observer.Wait();
     }
   }
 
   TestPrerenderContentsFactory* prerender_contents_factory_;
 #if defined(FULL_SAFE_BROWSING)
   scoped_ptr<TestSafeBrowsingServiceFactory> safe_browsing_factory_;
 #endif
   NeverRunsExternalProtocolHandlerDelegate external_protocol_handler_delegate_;
   GURL dest_url_;
@@ skipping 2446 matching lines @@
 
   NavigateToDestURL();
   EXPECT_EQ(1U, task_manager.tasks().size());
 }
 
 }  // namespace
 
 #endif  // defined(ENABLE_TASK_MANAGER)
 
 }  // namespace prerender