Revert of Add ExecuteJavaScriptForTest and make all tests use it

chrome/browser/apps/custom_launcher_page_browsertest_views.cc

 // Copyright 2014 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 <string>
 
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
@@ skipping 95 matching lines @@
         GetAppListView()->app_list_main_view()->contents_view();
     views::WebView* custom_page_view = static_cast<views::WebView*>(
         contents_view->custom_page_view()->custom_launcher_page_contents());
     content::RenderFrameHost* custom_page_frame =
         custom_page_view->GetWebContents()->GetMainFrame();
 
     const char* test_message =
         enabled ? "launcherPageEnabled" : "launcherPageDisabled";
 
     ExtensionTestMessageListener listener(test_message, false);
-    custom_page_frame->ExecuteJavaScriptForTests(
-        enabled ? kLauncherPageEnableScript : kLauncherPageDisableScript);
+    custom_page_frame->ExecuteJavaScript(enabled ? kLauncherPageEnableScript
+                                                 : kLauncherPageDisableScript);
     listener.WaitUntilSatisfied();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CustomLauncherPageBrowserTest);
 };
 
 IN_PROC_BROWSER_TEST_F(CustomLauncherPageBrowserTest,
                        OpenLauncherAndSwitchToCustomPage) {
   LoadAndLaunchPlatformApp(kCustomLauncherPagePath, "Launched");
@@ skipping 204 matching lines @@
   content::RenderFrameHost* custom_page_frame =
       custom_page_view->GetWebContents()->GetMainFrame();
 
   ASSERT_TRUE(
       contents_view->IsStateActive(app_list::AppListModel::STATE_START));
 
   // Ensure launcherPage.show() will switch the page to the custom launcher page
   // if the app launcher is already showing.
   {
     ExtensionTestMessageListener listener("onPageProgressAt1", false);
-    custom_page_frame->ExecuteJavaScriptForTests(kLauncherPageShowScript);
+    custom_page_frame->ExecuteJavaScript(kLauncherPageShowScript);
 
     listener.WaitUntilSatisfied();
     EXPECT_TRUE(contents_view->IsStateActive(
         app_list::AppListModel::STATE_CUSTOM_LAUNCHER_PAGE));
   }
 
   // Ensure launcherPage.show() will show the app list if it's hidden.
   {
     // Close the app list immediately.
     app_list_view->Close();
     app_list_view->GetWidget()->Close();
 
     ExtensionTestMessageListener listener("onPageProgressAt1", false);
-    custom_page_frame->ExecuteJavaScriptForTests(kLauncherPageShowScript);
+    custom_page_frame->ExecuteJavaScript(kLauncherPageShowScript);
 
     listener.WaitUntilSatisfied();
 
     // The app list view will have changed on ChromeOS.
     app_list_view = GetAppListView();
     contents_view = app_list_view->app_list_main_view()->contents_view();
     EXPECT_TRUE(contents_view->IsStateActive(
         app_list::AppListModel::STATE_CUSTOM_LAUNCHER_PAGE));
   }
 
   // Ensure launcherPage.hide() hides the launcher page when it's showing.
   {
     ExtensionTestMessageListener listener("onPageProgressAt0", false);
-    custom_page_frame->ExecuteJavaScriptForTests(kLauncherPageHideScript);
+    custom_page_frame->ExecuteJavaScript(kLauncherPageHideScript);
 
     listener.WaitUntilSatisfied();
 
     EXPECT_TRUE(
         contents_view->IsStateActive(app_list::AppListModel::STATE_START));
   }
 
   // Nothing should happen if hide() is called from the apps page.
   {
     contents_view->SetActiveState(app_list::AppListModel::STATE_APPS, false);
 
     ExtensionTestMessageListener listener("launcherPageHidden", false);
-    custom_page_frame->ExecuteJavaScriptForTests(kLauncherPageHideScript);
+    custom_page_frame->ExecuteJavaScript(kLauncherPageHideScript);
     listener.WaitUntilSatisfied();
 
     EXPECT_TRUE(
         contents_view->IsStateActive(app_list::AppListModel::STATE_APPS));
   }
 }
 
 IN_PROC_BROWSER_TEST_F(CustomLauncherPageBrowserTest, LauncherPageSetEnabled) {
   LoadAndLaunchPlatformApp(kCustomLauncherPagePath, "Launched");
   app_list::AppListView* app_list_view = GetAppListView();
@@ skipping 54 matching lines @@
   // And in reverse.
   EXPECT_EQ(
       search_box_textfield,
       app_list_view->GetFocusManager()->GetNextFocusableView(
           custom_page_webview, custom_page_webview->GetWidget(), true, false));
   EXPECT_EQ(custom_page_webview,
             app_list_view->GetFocusManager()->GetNextFocusableView(
                 search_box_textfield, search_box_textfield->GetWidget(), true,
                 false));
 }