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

chrome/browser/instant/instant_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/command_line.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/instant/instant_controller.h"
@@ skipping 18 matching lines @@
 #include "chrome/common/pref_names.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/navigation_controller.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/test/browser_test_utils.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::WebContents;
 
 // Tests are flaky on Linux because of http://crbug.com/80118.
 #if defined(OS_LINUX) && !defined(USE_ASH)
 #define MAYBE(TestName) DISABLED_ ## TestName
 #elif defined(OS_WIN)
 #define MAYBE(TestName) FLAKY_ ## TestName
@@ skipping 86 matching lines @@
   bool PressEnter() {
     return ui_test_utils::SendKeyPressSync(
         browser(), ui::VKEY_RETURN, false, false, false, false);
   }
 
   bool SetSuggestionsJavascriptArgument(const std::string& argument) {
     std::wstring script = UTF8ToWide(base::StringPrintf(
         "window.setSuggestionsArgument = %s;", argument.c_str()));
     content::RenderViewHost* rvh =
         preview()->web_contents()->GetRenderViewHost();
-    return ui_test_utils::ExecuteJavaScript(rvh, std::wstring(), script);
+    return content::ExecuteJavaScript(rvh, std::wstring(), script);
   }
 
   std::wstring WrapScript(const std::string& script) {
     return UTF8ToWide(base::StringPrintf(
         "window.domAutomationController.send(%s)", script.c_str()));
   }
 
   bool GetStringFromJavascript(WebContents* tab,
                                const std::string& script,
                                std::string* result) {
-    return ui_test_utils::ExecuteJavaScriptAndExtractString(
+    return content::ExecuteJavaScriptAndExtractString(
         tab->GetRenderViewHost(), std::wstring(), WrapScript(script), result);
   }
 
   bool GetIntFromJavascript(WebContents* tab,
                             const std::string& script,
                             int* result) {
-    return ui_test_utils::ExecuteJavaScriptAndExtractInt(
+    return content::ExecuteJavaScriptAndExtractInt(
         tab->GetRenderViewHost(), std::wstring(), WrapScript(script), result);
   }
 
   bool GetBoolFromJavascript(WebContents* tab,
                              const std::string& script,
                              bool* result) {
-    return ui_test_utils::ExecuteJavaScriptAndExtractBool(
+    return content::ExecuteJavaScriptAndExtractBool(
         tab->GetRenderViewHost(), std::wstring(), WrapScript(script), result);
   }
 
   bool CheckVisibilityIs(WebContents* tab, bool visible) {
     bool hidden = visible;
     return GetBoolFromJavascript(tab, "document.webkitHidden", &hidden) &&
            hidden != visible;
   }
 
   // Returns the state of the search box as a string. This consists of the
@@ skipping 422 matching lines @@
   instant_support_observer.Wait();
 
   // We should now have a preview, but it shouldn't be showing yet.
   EXPECT_TRUE(preview());
   EXPECT_FALSE(loader()->ready());
   EXPECT_FALSE(instant()->is_displayable());
   EXPECT_FALSE(instant()->IsCurrent());
 
   // Send onchange so that the page sends up suggestions. See the comments in
   // NonSearchToSearch for why this is needed.
-  ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
+  ASSERT_TRUE(content::ExecuteJavaScript(
       preview()->web_contents()->GetRenderViewHost(), std::wstring(),
       L"window.chrome.searchBox.onchange();"));
   ASSERT_TRUE(WaitForMessageToBeProcessedByRenderer());
 
   // Instant should be active, but not displaying.
   EXPECT_TRUE(preview());
   EXPECT_TRUE(loader()->ready());
   EXPECT_FALSE(instant()->is_displayable());
   EXPECT_FALSE(instant()->IsCurrent());
 }
@@ skipping 211 matching lines @@
   DetermineInstantSupport();
   SearchAndWaitForPreviewToShow();
 
   // Now there should be three rows, the third being the instant preview.
   TaskManagerBrowserTestUtil::WaitForResourceChange(3);
   string16 prefix = l10n_util::GetStringFUTF16(
       IDS_TASK_MANAGER_INSTANT_PREVIEW_PREFIX, string16());
   string16 title = task_manager->GetResourceTitle(2);
   EXPECT_TRUE(StartsWith(title, prefix, true)) << title << " vs " << prefix;
 }