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

content/browser/fileapi/file_system_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/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/test/thread_test_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/test/browser_test_utils.h"
 #include "webkit/quota/quota_manager.h"
 
 using content::BrowserThread;
 using quota::QuotaManager;
 
 // This browser test is aimed towards exercising the FileAPI bindings and
 // the actual implementation that lives in the browser side.
 class FileSystemBrowserTest : public InProcessBrowserTest {
  public:
   FileSystemBrowserTest() {}
 
   GURL testUrl(const FilePath& file_path) {
     const FilePath kTestDir(FILE_PATH_LITERAL("fileapi"));
     return ui_test_utils::GetTestUrl(kTestDir, file_path);
   }
 
   void SimpleTest(const GURL& test_url, bool incognito = false) {
     // The test page will perform tests on FileAPI, then navigate to either
     // a #pass or #fail ref.
     Browser* the_browser = incognito ? CreateIncognitoBrowser() : browser();
 
     LOG(INFO) << "Navigating to URL and blocking.";
     ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
         the_browser, test_url, 2);
     LOG(INFO) << "Navigation done.";
     std::string result =
         chrome::GetActiveWebContents(the_browser)->GetURL().ref();
     if (result != "pass") {
       std::string js_result;
-      ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(
+      ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
           chrome::GetActiveWebContents(the_browser)->GetRenderViewHost(), L"",
           L"window.domAutomationController.send(getLog())", &js_result));
       FAIL() << "Failed: " << js_result;
     }
   }
 };
 
 class FileSystemBrowserTestWithLowQuota : public FileSystemBrowserTest {
  public:
   virtual void SetUpOnMainThread() {
@@ skipping 27 matching lines @@
   SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("request_test.html"))));
 }
 
 IN_PROC_BROWSER_TEST_F(FileSystemBrowserTest, CreateTest) {
   SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("create_test.html"))));
 }
 
 IN_PROC_BROWSER_TEST_F(FileSystemBrowserTestWithLowQuota, QuotaTest) {
   SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("quota_test.html"))));
 }