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

chrome/browser/ui/webui/bookmarks_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/test/ui/ui_test.h"
 
 #include "base/test/test_timeouts.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 
 class BookmarksTest : public InProcessBrowserTest {
  public:
   BookmarksTest() {}
 
   void OpenBookmarksManager() {
     content::TestNavigationObserver navigation_observer(
         content::NotificationService::AllSources(), NULL, 2);
 
     // Bring up the bookmarks manager tab.
     chrome::ShowBookmarkManager(browser());
     navigation_observer.Wait();
   }
 
   void AssertIsBookmarksPage(content::WebContents* tab) {
     GURL url;
     std::string out;
-    ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(
+    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
         tab->GetRenderViewHost(), L"",
         L"domAutomationController.send(location.protocol)", &out));
     ASSERT_EQ("chrome-extension:", out);
-    ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(
+    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
         tab->GetRenderViewHost(), L"",
         L"domAutomationController.send(location.pathname)", &out));
     ASSERT_EQ("/main.html", out);
   }
 };
 
 IN_PROC_BROWSER_TEST_F(BookmarksTest, ShouldRedirectToExtension) {
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIBookmarksURL));
   AssertIsBookmarksPage(chrome::GetActiveWebContents(browser()));
 }
@@ skipping 38 matching lines @@
   navigation_observer.Wait();
 
   ASSERT_EQ(1, browser()->tab_count());
 }
 
 IN_PROC_BROWSER_TEST_F(BookmarksTest, BookmarksLoaded) {
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIBookmarksURL));
   ASSERT_EQ(1, browser()->tab_count());
   AssertIsBookmarksPage(chrome::GetActiveWebContents(browser()));
 }