Switch content tests to use BrowserThreadImpl directly.

content/browser/tab_contents/render_view_host_manager_unittest.cc

Index: content/browser/tab_contents/render_view_host_manager_unittest.cc
diff --git a/content/browser/tab_contents/render_view_host_manager_unittest.cc b/content/browser/tab_contents/render_view_host_manager_unittest.cc
index 4dc9cf80f9bc629b33b4fd513f454fee13c868c2..f7f5f6dc4c5897f0accf916b2d482e375fc8c0a6 100644
--- a/content/browser/tab_contents/render_view_host_manager_unittest.cc
+++ b/content/browser/tab_contents/render_view_host_manager_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
+#include "content/browser/browser_thread_impl.h"
 #include "content/browser/browser_url_handler.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/navigation_controller.h"
@@ -16,12 +17,12 @@
 #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"
 
+using content::BrowserThreadImpl;
+
 class RenderViewHostManagerTest : public ChromeRenderViewHostTestHarness {
  public:
   void NavigateActiveAndCommit(const GURL& url) {
@@ -61,8 +62,7 @@ class RenderViewHostManagerTest : public ChromeRenderViewHostTestHarness {
 // different SiteInstances, BrowsingInstances, and RenderProcessHosts. This is
 // a regression test for bug 9364.
 TEST_F(RenderViewHostManagerTest, NewTabPageProcesses) {
-  content::TestBrowserThread ui_thread(BrowserThread::UI,
-                                       MessageLoop::current());
+  BrowserThreadImpl ui_thread(BrowserThread::UI, MessageLoop::current());
   const GURL kNtpUrl(chrome::kTestNewTabURL);
   const GURL kDestUrl("http://www.google.com/");
 
@@ -121,8 +121,7 @@ TEST_F(RenderViewHostManagerTest, NewTabPageProcesses) {
 // EnableViewSourceMode message is sent on every navigation regardless
 // RenderView is being newly created or reused.
 TEST_F(RenderViewHostManagerTest, AlwaysSendEnableViewSourceMode) {
-  content::TestBrowserThread ui_thread(BrowserThread::UI,
-                                       MessageLoop::current());
+  BrowserThreadImpl ui_thread(BrowserThread::UI, MessageLoop::current());
   const GURL kNtpUrl(chrome::kTestNewTabURL);
   const GURL kUrl("view-source:http://foo");
 
@@ -274,8 +273,7 @@ TEST_F(RenderViewHostManagerTest, Navigate) {
 
 // Tests WebUI creation.
 TEST_F(RenderViewHostManagerTest, WebUI) {
-  content::TestBrowserThread ui_thread(BrowserThread::UI,
-                                       MessageLoop::current());
+  BrowserThreadImpl ui_thread(BrowserThread::UI, MessageLoop::current());
   SiteInstance* instance = SiteInstance::CreateSiteInstance(profile());
 
   TestTabContents tab_contents(profile(), instance);
@@ -315,7 +313,7 @@ TEST_F(RenderViewHostManagerTest, WebUI) {
 // still swap processes if ShouldSwapProcessesForNavigation is true.
 // Regression test for bug 46290.
 TEST_F(RenderViewHostManagerTest, NonWebUIChromeURLs) {
-  content::TestBrowserThread thread(BrowserThread::UI, &message_loop_);
+  BrowserThreadImpl thread(BrowserThread::UI, &message_loop_);
   SiteInstance* instance = SiteInstance::CreateSiteInstance(profile());
   TestTabContents tab_contents(profile(), instance);
   RenderViewHostManager manager(&tab_contents, &tab_contents);