Move ExecuteJavaScript functions from ui_test_utils.h to browser_test_utils.h so they can be reused…

content/browser/renderer_host/resource_dispatcher_host_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/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ skipping 106 matching lines @@
 };
 
 bool ResourceDispatcherHostBrowserTest::GetPopupTitle(const GURL& url,
                                                       string16* title) {
   ui_test_utils::NavigateToURL(browser(), url);
 
   ui_test_utils::WindowedTabAddedNotificationObserver observer(
       content::NotificationService::AllSources());
 
   // Create dynamic popup.
-  if (!ui_test_utils::ExecuteJavaScript(
-          render_view_host(), L"", L"OpenPopup();"))
+  if (!content::ExecuteJavaScript(render_view_host(), L"", L"OpenPopup();"))
     return false;
 
   observer.Wait();
 
   std::set<Browser*> excluded;
   excluded.insert(browser());
   Browser* popup = ui_test_utils::GetBrowserNotInSet(excluded);
   if (!popup)
     return false;
 
@@ skipping 70 matching lines @@
 }
 
 // Test for bug #1091358.
 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, SyncXMLHttpRequest) {
   ASSERT_TRUE(test_server()->Start());
   ui_test_utils::NavigateToURL(
       browser(), test_server()->GetURL("files/sync_xmlhttprequest.html"));
 
   // Let's check the XMLHttpRequest ran successfully.
   bool success = false;
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
       L"",
       L"window.domAutomationController.send(DidSyncRequestSucceed());",
       &success));
   EXPECT_TRUE(success);
 }
 
 // If this flakes, use http://crbug.com/62776.
 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
                        SyncXMLHttpRequest_Disallowed) {
   ASSERT_TRUE(test_server()->Start());
   ui_test_utils::NavigateToURL(
       browser(),
       test_server()->GetURL("files/sync_xmlhttprequest_disallowed.html"));
 
   // Let's check the XMLHttpRequest ran successfully.
   bool success = false;
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
       L"",
       L"window.domAutomationController.send(DidSucceed());",
       &success));
   EXPECT_TRUE(success);
 }
 
 // Test for bug #1159553 -- A synchronous xhr (whose content-type is
 // downloadable) would trigger download and hang the renderer process,
 // if executed while navigating to a new page.
@@ skipping 154 matching lines @@
   // off the navigation, and wait to see that the tab loads.
   string16 expected_title16(ASCIIToUTF16("Title Of Awesomeness"));
   content::TitleWatcher title_watcher(
       chrome::GetActiveWebContents(browser()), expected_title16);
 
   bool success;
   GURL test_url(test_server()->GetURL("files/title2.html"));
   std::string redirect_script = "window.location='" +
       test_url.possibly_invalid_spec() + "';" +
       "window.domAutomationController.send(true);";
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
       L"", ASCIIToWide(redirect_script), &success));
   EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
 }
 
 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
                        CrossSiteNavigationErrorPage2) {
   ASSERT_TRUE(test_server()->Start());
 
   GURL url(test_server()->GetURL("files/title2.html"));
@@ skipping 37 matching lines @@
 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
                        CrossSiteFailedRequest) {
   // Visit another URL first to trigger a cross-site navigation.
   GURL url(content::kTestNewTabURL);
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Visit a URL that fails without calling ResourceDispatcherHost::Read.
   GURL broken_url("chrome://theme");
   CheckTitleTest(broken_url, "chrome://theme/ is not available", 1);
 }