Switch content tests to use BrowserThreadImpl directly.

content/browser/site_instance_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 "base/compiler_specific.h"
 #include "base/stl_util.h"
 #include "base/string16.h"
+#include "content/browser/browser_thread_impl.h"
 #include "content/browser/browsing_instance.h"
 #include "content/browser/child_process_security_policy.h"
 #include "content/browser/mock_content_browser_client.h"
 #include "content/browser/renderer_host/browser_render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/webui/empty_web_ui_factory.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/url_constants.h"
 #include "content/test/test_browser_context.h"
-#include "content/test/test_browser_thread.h"
 #include "googleurl/src/url_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThreadImpl;
+
 namespace {
 
 const char kSameAsAnyInstanceURL[] = "about:internets";
 
 const char kPrivilegedScheme[] = "privileged";
 
 class SiteInstanceTestWebUIFactory : public content::EmptyWebUIFactory {
  public:
   virtual bool UseWebUIForURL(content::BrowserContext* browser_context,
                               const GURL& url) const OVERRIDE {
@@ skipping 72 matching lines @@
   virtual void TearDown() {
     content::GetContentClient()->set_browser(old_browser_client_);
   }
 
   void SetPrivilegedProcessId(int process_id) {
     browser_client_.SetPrivilegedProcessId(process_id);
   }
 
  private:
   MessageLoopForUI message_loop_;
-  content::TestBrowserThread ui_thread_;
+  BrowserThreadImpl ui_thread_;
 
   SiteInstanceTestBrowserClient browser_client_;
   content::ContentBrowserClient* old_browser_client_;
 };
 
 class TestBrowsingInstance : public BrowsingInstance {
  public:
   TestBrowsingInstance(content::BrowserContext* browser_context,
                        int* deleteCounter)
       : BrowsingInstance(browser_context),
@@ skipping 430 matching lines @@
   // Make sure none of differing privilege processes are mixed.
   EXPECT_NE(extension1_instance->GetProcess(), webui1_instance->GetProcess());
 
   for (size_t i = 0; i < content::kMaxRendererProcessCount; ++i) {
     EXPECT_NE(extension1_instance->GetProcess(), hosts[i]);
     EXPECT_NE(webui1_instance->GetProcess(), hosts[i]);
   }
 
   STLDeleteContainerPointers(hosts.begin(), hosts.end());
 }