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

chrome/browser/extensions/isolated_app_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/utf_string_conversions.h"
 #include "chrome/browser/automation/automation_util.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/test/browser_test_utils.h"
 #include "net/base/mock_host_resolver.h"
 
+using content::ExecuteJavaScript;
+using content::ExecuteJavaScriptAndExtractString;
 using content::NavigationController;
 using content::WebContents;
 using content::RenderViewHost;
-using ui_test_utils::ExecuteJavaScript;
-using ui_test_utils::ExecuteJavaScriptAndExtractString;
 
 namespace {
 
 std::wstring WrapForJavascriptAndExtract(
     const wchar_t* javascript_expression) {
   return std::wstring(L"window.domAutomationController.send(") +
       javascript_expression + L")";
 }
 
 class IsolatedAppTest : public ExtensionBrowserTest {
@@ skipping 74 matching lines @@
   WebContents* tab3 = chrome::GetWebContentsAt(browser(), 2);
   ASSERT_TRUE(GetInstalledApp(tab1));
   ASSERT_TRUE(GetInstalledApp(tab2));
   ASSERT_TRUE(!GetInstalledApp(tab3));
 
   // Check that tabs see cannot each other's localStorage even though they are
   // in the same origin.
   RenderViewHost* app1_rvh = tab1->GetRenderViewHost();
   RenderViewHost* app2_rvh = tab2->GetRenderViewHost();
   RenderViewHost* non_app_rvh = tab3->GetRenderViewHost();
-  ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
+  ASSERT_TRUE(ExecuteJavaScript(
       app1_rvh, L"", L"window.localStorage.setItem('testdata', 'ls_app1');"));
-  ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
+  ASSERT_TRUE(ExecuteJavaScript(
       app2_rvh, L"", L"window.localStorage.setItem('testdata', 'ls_app2');"));
-  ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
+  ASSERT_TRUE(ExecuteJavaScript(
       non_app_rvh, L"",
       L"window.localStorage.setItem('testdata', 'ls_normal');"));
 
   ASSERT_TRUE(ExecuteJavaScript(
       app1_rvh, L"", L"window.localStorage.getItem('testdata');"));
 
   const std::wstring& kRetrieveLocalStorage =
       WrapForJavascriptAndExtract(L"window.localStorage.getItem('testdata')");
   std::string result;
   ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
@@ skipping 82 matching lines @@
   EXPECT_TRUE(HasCookie(chrome::GetWebContentsAt(browser(), 2), "nonAppFrame=6"));
 
   // Check that all tabs share the same localStorage if they have the same
   // origin.
   RenderViewHost* app1_rvh =
       chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost();
   RenderViewHost* app2_rvh =
       chrome::GetWebContentsAt(browser(), 1)->GetRenderViewHost();
   RenderViewHost* non_app_rvh =
       chrome::GetWebContentsAt(browser(), 2)->GetRenderViewHost();
-  ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
+  ASSERT_TRUE(ExecuteJavaScript(
       app1_rvh, L"", L"window.localStorage.setItem('testdata', 'ls_app1');"));
-  ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
+  ASSERT_TRUE(ExecuteJavaScript(
       app2_rvh, L"", L"window.localStorage.setItem('testdata', 'ls_app2');"));
-  ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
+  ASSERT_TRUE(ExecuteJavaScript(
       non_app_rvh, L"",
       L"window.localStorage.setItem('testdata', 'ls_normal');"));
 
   const std::wstring& kRetrieveLocalStorage =
       WrapForJavascriptAndExtract(L"window.localStorage.getItem('testdata')");
   std::string result;
   ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
       app1_rvh, L"", kRetrieveLocalStorage.c_str(), &result));
   EXPECT_EQ("ls_normal", result);
   ASSERT_TRUE(ExecuteJavaScriptAndExtractString(
@@ skipping 51 matching lines @@
             chrome::GetWebContentsAt(browser(), 2)->GetRenderProcessHost()->GetID());
   EXPECT_NE(process_id_0,
             chrome::GetWebContentsAt(browser(), 3)->GetRenderProcessHost()->GetID());
 
   // Navigating the second tab out of the app should cause a process swap.
   const GURL& non_app_url(base_url.Resolve("non_app/main.html"));
   NavigateInRenderer(chrome::GetWebContentsAt(browser(), 1), non_app_url);
   EXPECT_NE(process_id_1,
             chrome::GetWebContentsAt(browser(), 1)->GetRenderProcessHost()->GetID());
 }