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

content/browser/renderer_host/render_view_host_manager_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/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host_observer.h"
 #include "content/public/common/url_constants.h"
+#include "content/public/test/browser_test_utils.h"
 #include "net/base/net_util.h"
 #include "net/test/test_server.h"
 
 using content::RenderViewHost;
 using content::SiteInstance;
 
 class RenderViewHostManagerTest : public InProcessBrowserTest {
  public:
   RenderViewHostManagerTest() {}
 
@@ skipping 30 matching lines @@
 
   // Get the original SiteInstance for later comparison.
   scoped_refptr<SiteInstance> orig_site_instance(
       chrome::GetActiveWebContents(browser())->GetSiteInstance());
   EXPECT_TRUE(orig_site_instance != NULL);
 
   // Open a same-site link in a new tab.
   ui_test_utils::WindowedTabAddedNotificationObserver new_tab_observer((
       content::Source<content::WebContentsDelegate>(browser())));
   bool success = false;
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(clickSameSiteTargetedLink());",
       &success));
   EXPECT_TRUE(success);
   new_tab_observer.Wait();
 
   // Opens in new tab.
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
 
   // Wait for the navigation in the new tab to finish, if it hasn't.
   ui_test_utils::WaitForLoadStop(chrome::GetActiveWebContents(browser()));
   EXPECT_EQ("/files/navigate_opener.html",
             chrome::GetActiveWebContents(browser())->GetURL().path());
   EXPECT_EQ(1, browser()->active_index());
 
   // Should have the same SiteInstance.
   scoped_refptr<SiteInstance> blank_site_instance(
       chrome::GetActiveWebContents(browser())->GetSiteInstance());
   EXPECT_EQ(orig_site_instance, blank_site_instance);
 
   // We should have access to the opened tab's location.
   chrome::ActivateTabAt(browser(), 0, true);
   success = false;
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(testScriptAccessToWindow());",
       &success));
   EXPECT_TRUE(success);
 
   // Now navigate the new tab to a different site.
   chrome::ActivateTabAt(browser(), 1, true);
   ui_test_utils::NavigateToURL(browser(),
                                https_server.GetURL("files/title1.html"));
   scoped_refptr<SiteInstance> new_site_instance(
       chrome::GetActiveWebContents(browser())->GetSiteInstance());
   EXPECT_NE(orig_site_instance, new_site_instance);
 
   // We should no longer have script access to the opened tab's location.
   chrome::ActivateTabAt(browser(), 0, true);
   success = false;
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(testScriptAccessToWindow());",
       &success));
   EXPECT_FALSE(success);
 }
 
 // Test for crbug.com/24447.  Following a cross-site link with rel=noreferrer
 // and target=_blank should create a new SiteInstance.
 IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
                        SwapProcessWithRelNoreferrerAndTargetBlank) {
@@ skipping 14 matching lines @@
   ui_test_utils::NavigateToURL(browser(),
                                test_server()->GetURL(replacement_path));
 
   // Get the original SiteInstance for later comparison.
   scoped_refptr<SiteInstance> orig_site_instance(
       chrome::GetActiveWebContents(browser())->GetSiteInstance());
   EXPECT_TRUE(orig_site_instance != NULL);
 
   // Test clicking a rel=noreferrer + target=blank link.
   bool success = false;
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(clickNoRefTargetBlankLink());",
       &success));
   EXPECT_TRUE(success);
 
   // Wait for the tab to open.
   if (browser()->tab_count() < 2)
     ui_test_utils::WaitForNewTab(browser());
 
   // Opens in new tab.
@@ skipping 37 matching lines @@
   ui_test_utils::NavigateToURL(browser(),
                                test_server()->GetURL(replacement_path));
 
   // Get the original SiteInstance for later comparison.
   scoped_refptr<SiteInstance> orig_site_instance(
       chrome::GetActiveWebContents(browser())->GetSiteInstance());
   EXPECT_TRUE(orig_site_instance != NULL);
 
   // Test clicking a same-site rel=noreferrer + target=foo link.
   bool success = false;
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(clickSameSiteNoRefTargetedLink());",
       &success));
   EXPECT_TRUE(success);
 
   // Wait for the tab to open.
   if (browser()->tab_count() < 2)
     ui_test_utils::WaitForNewTab(browser());
 
   // Opens in new tab.
@@ skipping 36 matching lines @@
   ui_test_utils::NavigateToURL(browser(),
                                test_server()->GetURL(replacement_path));
 
   // Get the original SiteInstance for later comparison.
   scoped_refptr<SiteInstance> orig_site_instance(
       chrome::GetActiveWebContents(browser())->GetSiteInstance());
   EXPECT_TRUE(orig_site_instance != NULL);
 
   // Test clicking a target=blank link.
   bool success = false;
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(clickTargetBlankLink());",
       &success));
   EXPECT_TRUE(success);
 
   // Wait for the tab to open.
   if (browser()->tab_count() < 2)
     ui_test_utils::WaitForNewTab(browser());
 
   // Opens in new tab.
@@ skipping 32 matching lines @@
   ui_test_utils::NavigateToURL(browser(),
                                test_server()->GetURL(replacement_path));
 
   // Get the original SiteInstance for later comparison.
   scoped_refptr<SiteInstance> orig_site_instance(
       chrome::GetActiveWebContents(browser())->GetSiteInstance());
   EXPECT_TRUE(orig_site_instance != NULL);
 
   // Test clicking a rel=noreferrer link.
   bool success = false;
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(clickNoRefLink());",
       &success));
   EXPECT_TRUE(success);
 
   // Wait for the cross-site transition in the current tab to finish.
   ui_test_utils::WaitForLoadStop(chrome::GetActiveWebContents(browser()));
 
   // Opens in same tab.
   EXPECT_EQ(1, browser()->tab_count());
@@ skipping 30 matching lines @@
 
   // Get the original SiteInstance for later comparison.
   scoped_refptr<SiteInstance> orig_site_instance(
       chrome::GetActiveWebContents(browser())->GetSiteInstance());
   EXPECT_TRUE(orig_site_instance != NULL);
 
   // Test clicking a target=foo link.
   ui_test_utils::WindowedTabAddedNotificationObserver new_tab_observer((
       content::Source<content::WebContentsDelegate>(browser())));
   bool success = false;
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(clickSameSiteTargetedLink());",
       &success));
   EXPECT_TRUE(success);
   new_tab_observer.Wait();
 
   // Opens in new tab.
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
 
@@ skipping 15 matching lines @@
   scoped_refptr<SiteInstance> new_site_instance(
       new_contents->GetSiteInstance());
   EXPECT_NE(orig_site_instance, new_site_instance);
 
   // Clicking the original link in the first tab should cause us to swap back.
   chrome::ActivateTabAt(browser(), 0, true);
   content::WindowedNotificationObserver navigation_observer(
         content::NOTIFICATION_NAV_ENTRY_COMMITTED,
         content::Source<content::NavigationController>(
             &new_contents->GetController()));
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(clickSameSiteTargetedLink());",
       &success));
   EXPECT_TRUE(success);
   navigation_observer.Wait();
 
   // Should have swapped back and shown the new tab again.
   EXPECT_EQ(1, browser()->active_index());
   scoped_refptr<SiteInstance> revisit_site_instance(
       chrome::GetActiveWebContents(browser())->GetSiteInstance());
   EXPECT_EQ(orig_site_instance, revisit_site_instance);
 
   // If it navigates away to another process, the original window should
   // still be able to close it (using a cross-process close message).
   ui_test_utils::NavigateToURL(browser(),
                                https_server.GetURL("files/title1.html"));
   EXPECT_EQ(new_site_instance,
             chrome::GetActiveWebContents(browser())->GetSiteInstance());
   chrome::ActivateTabAt(browser(), 0, true);
   content::WindowedNotificationObserver close_observer(
         content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
         content::Source<content::WebContents>(new_contents));
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(testCloseWindow());",
       &success));
   EXPECT_TRUE(success);
   close_observer.Wait();
 }
 
 // Test for crbug.com/99202.  PostMessage calls should still work after
 // navigating the source and target windows to different sites.
 // Specifically:
@@ skipping 30 matching lines @@
       static_cast<WebContentsImpl*>(opener_contents)->
           GetRenderManagerForTesting();
 
   // 1) Open two more windows, one named.  These initially have openers but no
   // reference to each other.  We will later post a message between them.
 
   // First, a named target=foo window.
   ui_test_utils::WindowedTabAddedNotificationObserver new_tab_observer((
       content::Source<content::WebContentsDelegate>(browser())));
   bool success = false;
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       opener_contents->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(clickSameSiteTargetedLink());",
       &success));
   EXPECT_TRUE(success);
   new_tab_observer.Wait();
 
   // Wait for the navigation in the new tab to finish, if it hasn't, then
   // send it to post_message.html on a different site.
   content::WebContents* foo_contents = chrome::GetActiveWebContents(browser());
   ui_test_utils::WaitForLoadStop(foo_contents);
   EXPECT_EQ("/files/navigate_opener.html", foo_contents->GetURL().path());
   EXPECT_EQ(1, browser()->active_index());
   ui_test_utils::NavigateToURL(browser(),
                                https_server.GetURL("files/post_message.html"));
   scoped_refptr<SiteInstance> foo_site_instance(
       foo_contents->GetSiteInstance());
   EXPECT_NE(orig_site_instance, foo_site_instance);
 
   // Second, a target=_blank window.
   chrome::ActivateTabAt(browser(), 0, true);
   ui_test_utils::WindowedTabAddedNotificationObserver new_tab_observer2((
       content::Source<content::WebContentsDelegate>(browser())));
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(clickSameSiteTargetBlankLink());",
       &success));
   EXPECT_TRUE(success);
   new_tab_observer2.Wait();
 
   // Wait for the navigation in the new tab to finish, if it hasn't, then
   // send it to post_message.html on the original site.
   content::WebContents* new_contents = chrome::GetActiveWebContents(browser());
   ui_test_utils::WaitForLoadStop(new_contents);
   EXPECT_EQ("/files/title2.html", new_contents->GetURL().path());
   EXPECT_EQ(1, browser()->active_index());
   ui_test_utils::NavigateToURL(
       browser(), test_server()->GetURL("files/post_message.html"));
   EXPECT_EQ(orig_site_instance, new_contents->GetSiteInstance());
   RenderViewHostManager* new_manager =
       static_cast<WebContentsImpl*>(new_contents)->GetRenderManagerForTesting();
 
   // We now have three windows.  The opener should have a swapped out RVH
   // for the new SiteInstance, but the _blank window should not.
   EXPECT_EQ(3, browser()->tab_count());
   EXPECT_TRUE(opener_manager->GetSwappedOutRenderViewHost(foo_site_instance));
   EXPECT_FALSE(new_manager->GetSwappedOutRenderViewHost(foo_site_instance));
 
   // 2) Fail to post a message from the foo window to the opener if the target
   // origin is wrong.  We won't see an error, but we can check for the right
   // number of received messages below.
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       foo_contents->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(postToOpener('msg',"
       L"'http://google.com'));",
       &success));
   EXPECT_TRUE(success);
 
   // 3) Post a message from the foo window to the opener.  The opener will
   // reply, causing the foo window to update its own title.
   content::WindowedNotificationObserver title_observer(
         content::NOTIFICATION_WEB_CONTENTS_TITLE_UPDATED,
         content::Source<content::WebContents>(foo_contents));
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       foo_contents->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(postToOpener('msg','*'));",
       &success));
   EXPECT_TRUE(success);
   title_observer.Wait();
 
   // We should have received only 1 message in the opener and "foo" tabs,
   // and updated the title.
   int opener_received_messages = 0;
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractInt(
       opener_contents->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(window.receivedMessages);",
       &opener_received_messages));
   int foo_received_messages = 0;
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractInt(
       foo_contents->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(window.receivedMessages);",
       &foo_received_messages));
   EXPECT_EQ(1, foo_received_messages);
   EXPECT_EQ(1, opener_received_messages);
   EXPECT_EQ(ASCIIToUTF16("msg"), foo_contents->GetTitle());
 
   // 4) Now post a message from the _blank window to the foo window.  The
   // foo window will update its title and will not reply.
   content::WindowedNotificationObserver title_observer2(
         content::NOTIFICATION_WEB_CONTENTS_TITLE_UPDATED,
         content::Source<content::WebContents>(foo_contents));
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       new_contents->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(postToFoo('msg2'));",
       &success));
   EXPECT_TRUE(success);
   title_observer2.Wait();
   EXPECT_EQ(ASCIIToUTF16("msg2"), foo_contents->GetTitle());
 
   // This postMessage should have created a swapped out RVH for the new
   // SiteInstance in the target=_blank window.
   EXPECT_TRUE(new_manager->GetSwappedOutRenderViewHost(foo_site_instance));
@@ skipping 23 matching lines @@
   // Get the original tab and SiteInstance for later comparison.
   content::WebContents* orig_contents = chrome::GetActiveWebContents(browser());
   scoped_refptr<SiteInstance> orig_site_instance(
       chrome::GetActiveWebContents(browser())->GetSiteInstance());
   EXPECT_TRUE(orig_site_instance != NULL);
 
   // Test clicking a target=foo link.
   ui_test_utils::WindowedTabAddedNotificationObserver new_tab_observer((
       content::Source<content::WebContentsDelegate>(browser())));
   bool success = false;
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(clickSameSiteTargetedLink());",
       &success));
   EXPECT_TRUE(success);
   new_tab_observer.Wait();
 
   // Opens in new tab.
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
 
@@ skipping 15 matching lines @@
   scoped_refptr<SiteInstance> new_site_instance(
       chrome::GetActiveWebContents(browser())->GetSiteInstance());
   EXPECT_NE(orig_site_instance, new_site_instance);
 
   // The opened tab should be able to navigate the opener back to its process.
   chrome::ActivateTabAt(browser(), 1, true);
   content::WindowedNotificationObserver navigation_observer(
         content::NOTIFICATION_NAV_ENTRY_COMMITTED,
         content::Source<content::NavigationController>(
             &orig_contents->GetController()));
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(navigateOpener());",
       &success));
   EXPECT_TRUE(success);
   navigation_observer.Wait();
 
   // Active tab should not have changed.
   EXPECT_EQ(1, browser()->active_index());
 
   // Should have swapped back into this process.
@@ skipping 27 matching lines @@
 
   // Get the original SiteInstance for later comparison.
   scoped_refptr<SiteInstance> orig_site_instance(
       chrome::GetActiveWebContents(browser())->GetSiteInstance());
   EXPECT_TRUE(orig_site_instance != NULL);
 
   // Test clicking a target=foo link.
   ui_test_utils::WindowedTabAddedNotificationObserver new_tab_observer((
       content::Source<content::WebContentsDelegate>(browser())));
   bool success = false;
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(clickSameSiteTargetedLink());",
       &success));
   EXPECT_TRUE(success);
   new_tab_observer.Wait();
 
   // Opens in new tab.
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
 
@@ skipping 70 matching lines @@
       chrome::GetActiveWebContents(browser())->GetSiteInstance());
   EXPECT_EQ(orig_site_instance, post_nav_site_instance);
   EXPECT_EQ("/nocontent",
             chrome::GetActiveWebContents(browser())->GetURL().path());
   EXPECT_EQ("/files/click-noreferrer-links.html",
             chrome::GetActiveWebContents(browser())->GetController().
                 GetLastCommittedEntry()->GetVirtualURL().path());
 
   // Renderer-initiated navigations should work.
   bool success = false;
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(clickNoRefLink());",
       &success));
   EXPECT_TRUE(success);
 
   // Wait for the cross-site transition in the current tab to finish.
   ui_test_utils::WaitForLoadStop(chrome::GetActiveWebContents(browser()));
 
   // Opens in same tab.
   EXPECT_EQ(1, browser()->tab_count());
@@ skipping 151 matching lines @@
       "files/click-noreferrer-links.html",
       https_server.host_port_pair(),
       &replacement_path));
   ui_test_utils::NavigateToURL(browser(),
                                test_server()->GetURL(replacement_path));
 
   // Open a same-site link in a new tab.
   ui_test_utils::WindowedTabAddedNotificationObserver new_tab_observer((
       content::Source<content::WebContentsDelegate>(browser())));
   bool success = false;
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
       L"window.domAutomationController.send(clickSameSiteTargetedLink());",
       &success));
   EXPECT_TRUE(success);
   new_tab_observer.Wait();
 
   // Opens in new tab.
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
 
   // Wait for the navigation in the new tab to finish, if it hasn't.
   ui_test_utils::WaitForLoadStop(chrome::GetActiveWebContents(browser()));
   EXPECT_EQ("/files/navigate_opener.html",
             chrome::GetActiveWebContents(browser())->GetURL().path());
   EXPECT_EQ(1, browser()->active_index());
 
   RenderViewHost* rvh =
       chrome::GetActiveWebContents(browser())->GetRenderViewHost();
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       rvh, L"",
       L"window.domAutomationController.send("
           L"document.webkitVisibilityState == 'visible');",
       &success));
   EXPECT_TRUE(success);
 
   // Now navigate the new tab to a different site. This should swap out the
   // tab's existing RenderView, causing it become hidden.
   chrome::ActivateTabAt(browser(), 1, true);
   ui_test_utils::NavigateToURL(browser(),
                                https_server.GetURL("files/title1.html"));
 
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       rvh, L"",
       L"window.domAutomationController.send("
           L"document.webkitVisibilityState == 'hidden');",
       &success));
   EXPECT_TRUE(success);
 
   // Going back should make the previously swapped-out view to become visible
   // again.
   {
     content::WindowedNotificationObserver back_nav_load_observer(
         content::NOTIFICATION_NAV_ENTRY_COMMITTED,
         content::Source<content::NavigationController>(
             &chrome::GetActiveWebContents(browser())->GetController()));
     chrome::GoBack(browser(), CURRENT_TAB);
     back_nav_load_observer.Wait();
   }
 
 
   EXPECT_EQ("/files/navigate_opener.html",
             chrome::GetActiveWebContents(browser())->GetURL().path());
 
   EXPECT_EQ(rvh, chrome::GetActiveWebContents(browser())->GetRenderViewHost());
 
-  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       rvh, L"",
       L"window.domAutomationController.send("
           L"document.webkitVisibilityState == 'visible');",
       &success));
   EXPECT_TRUE(success);
 }
 
 // This class holds onto RenderViewHostObservers for as long as their observed
 // RenderViewHosts are alive. This allows us to confirm that all hosts have
 // properly been shutdown.
@@ skipping 81 matching lines @@
   // Now navigate to a different instance so that we swap out again.
   ui_test_utils::NavigateToURL(browser(),
                                https_server.GetURL("files/title2.html"));
   rvh_observers.AddObserverToRVH(chrome::GetActiveWebContents(browser())->
       GetRenderViewHost());
 
   // This used to leak a render view host.
   chrome::CloseWebContents(browser(), chrome::GetActiveWebContents(browser()));
   EXPECT_EQ(0U, rvh_observers.GetNumObservers());
 }