Split BrowserThread into public API and private implementation, step 1.

chrome/browser/component_updater/component_updater_service_unittest.cc

Index: chrome/browser/component_updater/component_updater_service_unittest.cc
diff --git a/chrome/browser/component_updater/component_updater_service_unittest.cc b/chrome/browser/component_updater/component_updater_service_unittest.cc
index 4e72a325a4585ef771c5f77a7c3ddd9b3c8597ec..226c1fc55f09e54b5fdcfba897b233107bf3d58b 100644
--- a/chrome/browser/component_updater/component_updater_service_unittest.cc
+++ b/chrome/browser/component_updater/component_updater_service_unittest.cc
@@ -10,13 +10,13 @@
 #include "base/path_service.h"
 #include "base/values.h"
 #include "chrome/browser/component_updater/component_updater_interceptor.h"
-#include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/test_url_request_context_getter.h"
-#include "content/browser/browser_thread.h"
 #include "content/common/net/url_fetcher.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_service.h"
+#include "content/test/test_browser_thread.h"
 #include "content/test/test_notification_tracker.h"
 
 #include "googleurl/src/gurl.h"
@@ -178,7 +178,7 @@ class ComponentUpdaterTest : public testing::Test {
     return test_config_;
   }
 
-  void RegisterComponent(CrxComponent* com, 
+  void RegisterComponent(CrxComponent* com,
                        TestComponents component,
                        const Version& version) {
     if (component == kTestComponent_abag) {
@@ -212,7 +212,7 @@ TEST_F(ComponentUpdaterTest, VerifyFixture) {
 // if there is no work to do, there are no notifications generated.
 TEST_F(ComponentUpdaterTest, StartStop) {
   MessageLoop message_loop;
-  BrowserThread ui_thread(BrowserThread::UI, &message_loop);
+  content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop);
 
   component_updater()->Start();
   message_loop.RunAllPending();
@@ -226,9 +226,9 @@ TEST_F(ComponentUpdaterTest, StartStop) {
 // are generated.
 TEST_F(ComponentUpdaterTest, CheckCrxSleep) {
   MessageLoop message_loop;
-  BrowserThread ui_thread(BrowserThread::UI, &message_loop);
-  BrowserThread file_thread(BrowserThread::FILE);
-  BrowserThread io_thread(BrowserThread::IO);
+  content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop);
+  content::TestBrowserThread file_thread(BrowserThread::FILE);
+  content::TestBrowserThread io_thread(BrowserThread::IO);
 
   io_thread.StartWithOptions(base::Thread::Options(MessageLoop::TYPE_IO, 0));
   file_thread.Start();
@@ -310,9 +310,9 @@ TEST_F(ComponentUpdaterTest, CheckCrxSleep) {
 // 3- second manifest check.
 TEST_F(ComponentUpdaterTest, InstallCrx) {
   MessageLoop message_loop;
-  BrowserThread ui_thread(BrowserThread::UI, &message_loop);
-  BrowserThread file_thread(BrowserThread::FILE);
-  BrowserThread io_thread(BrowserThread::IO);
+  content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop);
+  content::TestBrowserThread file_thread(BrowserThread::FILE);
+  content::TestBrowserThread io_thread(BrowserThread::IO);
 
   io_thread.StartWithOptions(base::Thread::Options(MessageLoop::TYPE_IO, 0));
   file_thread.Start();
@@ -324,7 +324,7 @@ TEST_F(ComponentUpdaterTest, InstallCrx) {
   RegisterComponent(&com1, kTestComponent_jebg, Version("0.9"));
   CrxComponent com2;
   RegisterComponent(&com2, kTestComponent_abag, Version("2.2"));
-  
+
   const char expected_update_url_1[] =
       "http://localhost/upd?extra=foo&x=id%3D"
       "jebgalgnebhfojomionfpkfelancnnkf%26v%3D0.9%26uc&x=id%3D"
@@ -376,9 +376,9 @@ TEST_F(ComponentUpdaterTest, InstallCrx) {
 // version is much higher than of chrome.
 TEST_F(ComponentUpdaterTest, ProdVersionCheck) {
   MessageLoop message_loop;
-  BrowserThread ui_thread(BrowserThread::UI, &message_loop);
-  BrowserThread file_thread(BrowserThread::FILE);
-  BrowserThread io_thread(BrowserThread::IO);
+  content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop);
+  content::TestBrowserThread file_thread(BrowserThread::FILE);
+  content::TestBrowserThread io_thread(BrowserThread::IO);
 
   io_thread.StartWithOptions(base::Thread::Options(MessageLoop::TYPE_IO, 0));
   file_thread.Start();