Salient parts of http://codereview.chromium.org/8392042/

content/browser/tab_contents/render_view_host_manager_unittest.cc

 // Copyright (c) 2011 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 "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
-#include "content/browser/browser_thread.h"
 #include "content/browser/browser_url_handler.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/render_view_host_manager.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
 #include "content/common/test_url_constants.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/page_transition_types.h"
+#include "content/test/test_browser_thread.h"
+#include "content/test/test_browser_thread.h"
 #include "content/test/test_notification_tracker.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/webkit_glue.h"
 
 class RenderViewHostManagerTest : public ChromeRenderViewHostTestHarness {
  public:
   void NavigateActiveAndCommit(const GURL& url) {
     // Note: we navigate the active RenderViewHost because previous navigations
     // won't have committed yet, so NavigateAndCommit does the wrong thing
     // for us.
@@ skipping 23 matching lines @@
                            const NavigationEntry* new_entry) const {
     return manager->ShouldSwapProcessesForNavigation(cur_entry, new_entry);
   }
 };
 
 // Tests that when you navigate from the New TabPage to another page, and
 // then do that same thing in another tab, that the two resulting pages have
 // different SiteInstances, BrowsingInstances, and RenderProcessHosts. This is
 // a regression test for bug 9364.
 TEST_F(RenderViewHostManagerTest, NewTabPageProcesses) {
-  BrowserThread ui_thread(BrowserThread::UI, MessageLoop::current());
+  content::TestBrowserThread ui_thread(BrowserThread::UI,
+                                       MessageLoop::current());
   const GURL kNtpUrl(chrome::kTestNewTabURL);
   const GURL kDestUrl("http://www.google.com/");
 
   // Navigate our first tab to the new tab page and then to the destination.
   NavigateActiveAndCommit(kNtpUrl);
   NavigateActiveAndCommit(kDestUrl);
 
   // Make a second tab.
   TestTabContents contents2(profile(), NULL);
 
@@ skipping 38 matching lines @@
 
   EXPECT_EQ(active_rvh()->site_instance(),
       contents2.render_view_host()->site_instance());
 }
 
 // When there is an error with the specified page, renderer exits view-source
 // mode. See WebFrameImpl::DidFail(). We check by this test that
 // EnableViewSourceMode message is sent on every navigation regardless
 // RenderView is being newly created or reused.
 TEST_F(RenderViewHostManagerTest, AlwaysSendEnableViewSourceMode) {
-  BrowserThread ui_thread(BrowserThread::UI, MessageLoop::current());
+  content::TestBrowserThread ui_thread(BrowserThread::UI,
+                                       MessageLoop::current());
   const GURL kNtpUrl(chrome::kTestNewTabURL);
   const GURL kUrl("view-source:http://foo");
 
   // We have to navigate to some page at first since without this, the first
   // navigation will reuse the SiteInstance created by Init(), and the second
   // one will create a new SiteInstance. Because current_instance and
   // new_instance will be different, a new RenderViewHost will be created for
   // the second navigation. We have to avoid this in order to exercise the
   // target code patch.
   NavigateActiveAndCommit(kNtpUrl);
@@ skipping 131 matching lines @@
   // Check the pending RenderViewHost has been committed.
   EXPECT_FALSE(manager.pending_render_view_host());
 
   // We should observe a notification.
   EXPECT_TRUE(notifications.Check1AndReset(
       content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED));
 }
 
 // Tests WebUI creation.
 TEST_F(RenderViewHostManagerTest, WebUI) {
-  BrowserThread ui_thread(BrowserThread::UI, MessageLoop::current());
+  content::TestBrowserThread ui_thread(BrowserThread::UI,
+                                       MessageLoop::current());
   SiteInstance* instance = SiteInstance::CreateSiteInstance(profile());
 
   TestTabContents tab_contents(profile(), instance);
   RenderViewHostManager manager(&tab_contents, &tab_contents);
 
   manager.Init(profile(), instance, MSG_ROUTING_NONE);
 
   const GURL kUrl(chrome::kTestNewTabURL);
   NavigationEntry entry(NULL /* instance */, -1 /* page_id */, kUrl,
                         GURL() /* referrer */, string16() /* title */,
@@ skipping 19 matching lines @@
 
   // Commit.
   manager.DidNavigateMainFrame(host);
 }
 
 // Tests that chrome: URLs that are not Web UI pages do not get grouped into
 // Web UI renderers, even if --process-per-tab is enabled.  In that mode, we
 // still swap processes if ShouldSwapProcessesForNavigation is true.
 // Regression test for bug 46290.
 TEST_F(RenderViewHostManagerTest, NonWebUIChromeURLs) {
-  BrowserThread thread(BrowserThread::UI, &message_loop_);
+  content::TestBrowserThread thread(BrowserThread::UI, &message_loop_);
   SiteInstance* instance = SiteInstance::CreateSiteInstance(profile());
   TestTabContents tab_contents(profile(), instance);
   RenderViewHostManager manager(&tab_contents, &tab_contents);
   manager.Init(profile(), instance, MSG_ROUTING_NONE);
 
   // NTP is a Web UI page.
   const GURL kNtpUrl(chrome::kTestNewTabURL);
   NavigationEntry ntp_entry(NULL /* instance */, -1 /* page_id */, kNtpUrl,
                             GURL() /* referrer */, string16() /* title */,
                             content::PAGE_TRANSITION_TYPED,
@@ skipping 51 matching lines @@
   // current one.
   EXPECT_TRUE(contents()->render_manager_for_testing()->
       pending_render_view_host() == NULL);
   EXPECT_EQ(evil_rvh, contents()->render_manager_for_testing()->current_host());
 
   // Also we should not have a pending navigation entry.
   NavigationEntry* entry = contents()->controller().GetActiveEntry();
   ASSERT_TRUE(entry != NULL);
   EXPECT_EQ(kUrl2, entry->url());
 }