Move WaitForLoadStop from ui_test_utils to browser_test_utils so that it can be reused in content_b…

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"
@@ skipping 68 matching lines @@
       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()));
+  content::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.
@@ skipping 61 matching lines @@
   if (browser()->tab_count() < 2)
     ui_test_utils::WaitForNewTab(browser());
 
   // Opens in new tab.
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
   EXPECT_EQ("/files/title2.html",
             chrome::GetActiveWebContents(browser())->GetURL().path());
 
   // Wait for the cross-site transition in the new tab to finish.
-  ui_test_utils::WaitForLoadStop(chrome::GetActiveWebContents(browser()));
+  content::WaitForLoadStop(chrome::GetActiveWebContents(browser()));
   WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
       chrome::GetActiveWebContents(browser()));
   EXPECT_FALSE(web_contents->GetRenderManagerForTesting()->
       pending_render_view_host());
 
   // Should have a new SiteInstance.
   scoped_refptr<SiteInstance> noref_blank_site_instance(
       chrome::GetActiveWebContents(browser())->GetSiteInstance());
   EXPECT_NE(orig_site_instance, noref_blank_site_instance);
 }
@@ skipping 37 matching lines @@
   if (browser()->tab_count() < 2)
     ui_test_utils::WaitForNewTab(browser());
 
   // Opens in new tab.
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
   EXPECT_EQ("/files/title2.html",
             chrome::GetActiveWebContents(browser())->GetURL().path());
 
   // Wait for the cross-site transition in the new tab to finish.
-  ui_test_utils::WaitForLoadStop(chrome::GetActiveWebContents(browser()));
+  content::WaitForLoadStop(chrome::GetActiveWebContents(browser()));
   WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
       chrome::GetActiveWebContents(browser()));
   EXPECT_FALSE(web_contents->GetRenderManagerForTesting()->
       pending_render_view_host());
 
   // Should have a new SiteInstance (in a new BrowsingInstance).
   scoped_refptr<SiteInstance> noref_blank_site_instance(
       chrome::GetActiveWebContents(browser())->GetSiteInstance());
   EXPECT_NE(orig_site_instance, noref_blank_site_instance);
 }
@@ skipping 34 matching lines @@
 
   // Wait for the tab to open.
   if (browser()->tab_count() < 2)
     ui_test_utils::WaitForNewTab(browser());
 
   // Opens in new tab.
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
 
   // Wait for the cross-site transition in the new tab to finish.
-  ui_test_utils::WaitForLoadStop(chrome::GetActiveWebContents(browser()));
+  content::WaitForLoadStop(chrome::GetActiveWebContents(browser()));
   EXPECT_EQ("/files/title2.html",
             chrome::GetActiveWebContents(browser())->GetURL().path());
 
   // Should have the same SiteInstance.
   scoped_refptr<SiteInstance> blank_site_instance(
       chrome::GetActiveWebContents(browser())->GetSiteInstance());
   EXPECT_EQ(orig_site_instance, blank_site_instance);
 }
 
 // Test for crbug.com/24447.  Following a cross-site link with rel=noreferrer
@@ skipping 24 matching lines @@
 
   // Test clicking a rel=noreferrer link.
   bool success = false;
   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()));
+  content::WaitForLoadStop(chrome::GetActiveWebContents(browser()));
 
   // Opens in same tab.
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_EQ(0, browser()->active_index());
   EXPECT_EQ("/files/title2.html",
             chrome::GetActiveWebContents(browser())->GetURL().path());
 
   // Should have the same SiteInstance.
   scoped_refptr<SiteInstance> noref_site_instance(
       chrome::GetActiveWebContents(browser())->GetSiteInstance());
@@ skipping 35 matching lines @@
       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()));
+  content::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);
 
   // Now navigate the new tab to a different site.
@@ skipping 87 matching lines @@
   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);
+  content::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(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);
+  content::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.
@@ skipping 93 matching lines @@
       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()));
+  content::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);
 
   // Now navigate the original (opener) tab to a different site.
@@ skipping 63 matching lines @@
       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()));
+  content::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> opened_site_instance(
       chrome::GetActiveWebContents(browser())->GetSiteInstance());
   EXPECT_EQ(orig_site_instance, opened_site_instance);
 
   // Now navigate the opened tab to a different site.
@@ skipping 65 matching lines @@
 
   // Renderer-initiated navigations should work.
   bool success = false;
   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()));
+  content::WaitForLoadStop(chrome::GetActiveWebContents(browser()));
 
   // Opens in same tab.
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_EQ(0, browser()->active_index());
   EXPECT_EQ("/files/title2.html",
             chrome::GetActiveWebContents(browser())->GetURL().path());
 
   // Should have the same SiteInstance.
   scoped_refptr<SiteInstance> noref_site_instance(
       chrome::GetActiveWebContents(browser())->GetSiteInstance());
@@ skipping 156 matching lines @@
       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()));
+  content::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(content::ExecuteJavaScriptAndExtractBool(
       rvh, L"",
       L"window.domAutomationController.send("
           L"document.webkitVisibilityState == 'visible');",
@@ skipping 125 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());
 }