Rename ChromeThread to BrowserThread Part16:

- Rename entries starting from shell_integration.cc. More 30 files covered.

BUG=56926
TEST=trybots

Review URL: http://codereview.chromium.org/3708001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62136 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 25 insertions, 25 deletions

diff --git a/chrome/test/browser_with_test_window_test.cc b/chrome/test/browser_with_test_window_test.cc
index 814046d..9813dfd 100644
--- a/chrome/test/browser_with_test_window_test.cc
+++ b/chrome/test/browser_with_test_window_test.cc
@@ -17,7 +17,7 @@
 #include "chrome/test/testing_profile.h"
 
 BrowserWithTestWindowTest::BrowserWithTestWindowTest()
-    : ui_thread_(ChromeThread::UI, message_loop()),
+    : ui_thread_(BrowserThread::UI, message_loop()),
       rph_factory_(),
       rvh_factory_(&rph_factory_) {
 #if defined(OS_WIN)
diff --git a/chrome/test/browser_with_test_window_test.h b/chrome/test/browser_with_test_window_test.h
index c57a2f9..22db146 100644
--- a/chrome/test/browser_with_test_window_test.h
+++ b/chrome/test/browser_with_test_window_test.h
@@ -90,7 +90,7 @@ class BrowserWithTestWindowTest : public testing::Test {
 
   // We need to create a MessageLoop, otherwise a bunch of things fails.
   MessageLoopForUI ui_loop_;
-  ChromeThread ui_thread_;
+  BrowserThread ui_thread_;
 
   scoped_ptr<TestingProfile> profile_;
   scoped_ptr<TestBrowserWindow> window_;
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc
index 0c9b957..a44a99a 100644
--- a/chrome/test/in_process_browser_test.cc
+++ b/chrome/test/in_process_browser_test.cc
@@ -308,8 +308,8 @@ void InProcessBrowserTest::RunTestOnMainThreadLoop() {
   }
   pool.Recycle();
 
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableFunction(chrome_browser_net::SetUrlRequestMocksEnabled, true));
 
   browser_ = CreateBrowser(profile);
diff --git a/chrome/test/live_sync/live_autofill_sync_test.h b/chrome/test/live_sync/live_autofill_sync_test.h
index 48c1db2..f591488 100644
--- a/chrome/test/live_sync/live_autofill_sync_test.h
+++ b/chrome/test/live_sync/live_autofill_sync_test.h
@@ -54,9 +54,9 @@ class GetAllAutofillEntries
         done_event_(false, false) {}
 
   void Init() {
-    DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
-    ChromeThread::PostTask(
-        ChromeThread::DB,
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    BrowserThread::PostTask(
+        BrowserThread::DB,
         FROM_HERE,
         NewRunnableMethod(this, &GetAllAutofillEntries::Run));
     done_event_.Wait();
@@ -70,7 +70,7 @@ class GetAllAutofillEntries
   friend class base::RefCountedThreadSafe<GetAllAutofillEntries>;
 
   void Run() {
-    DCHECK(ChromeThread::CurrentlyOn(ChromeThread::DB));
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
     web_data_service_->GetDatabase()->GetAllAutofillEntries(&entries_);
     done_event_.Signal();
   }
diff --git a/chrome/test/live_sync/live_sync_test.cc b/chrome/test/live_sync/live_sync_test.cc
index 807390c..d9f1f32 100644
--- a/chrome/test/live_sync/live_sync_test.cc
+++ b/chrome/test/live_sync/live_sync_test.cc
@@ -385,8 +385,8 @@ void LiveSyncTest::DisableNetwork(Profile* profile) {
 void LiveSyncTest::SetProxyConfig(URLRequestContextGetter* context_getter,
                                   const net::ProxyConfig& proxy_config) {
   base::WaitableEvent done(false, false);
-  ChromeThread::PostTask(
-      ChromeThread::IO,
+  BrowserThread::PostTask(
+      BrowserThread::IO,
       FROM_HERE,
       new SetProxyConfigTask(&done,
                              context_getter,
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc
index 45362d6..7fdae5e 100644
--- a/chrome/test/testing_profile.cc
+++ b/chrome/test/testing_profile.cc
@@ -112,7 +112,7 @@ class BookmarkLoadObserver : public BookmarkModelObserver {
 
 // Used to return a dummy context (normally the context is on the IO thread).
 // The one here can be run on the main test thread. Note that this can lead to
-// a leak if your test does not have a ChromeThread::IO in it because
+// a leak if your test does not have a BrowserThread::IO in it because
 // URLRequestContextGetter is defined as a ReferenceCounted object with a
 // special trait that deletes it on the IO thread.
 class TestURLRequestContextGetter : public URLRequestContextGetter {
@@ -123,7 +123,7 @@ class TestURLRequestContextGetter : public URLRequestContextGetter {
     return context_.get();
   }
   virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() {
-    return ChromeThread::GetMessageLoopProxyForThread(ChromeThread::IO);
+    return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
   }
 
  private:
@@ -148,7 +148,7 @@ class TestExtensionURLRequestContextGetter : public URLRequestContextGetter {
     return context_.get();
   }
   virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() {
-    return ChromeThread::GetMessageLoopProxyForThread(ChromeThread::IO);
+    return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
   }
 
  private:
@@ -466,7 +466,7 @@ NTPResourceCache* TestingProfile::GetNTPResourceCache() {
 }
 
 DesktopNotificationService* TestingProfile::GetDesktopNotificationService() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!desktop_notification_service_.get()) {
     desktop_notification_service_.reset(new DesktopNotificationService(
         this, NULL));
diff --git a/chrome/test/thread_observer_helper.h b/chrome/test/thread_observer_helper.h
index 3a6dbcd..2ba46cf 100644
--- a/chrome/test/thread_observer_helper.h
+++ b/chrome/test/thread_observer_helper.h
@@ -18,12 +18,12 @@
 template <class T, typename Traits>
 class ThreadObserverHelper : public base::RefCountedThreadSafe<T, Traits> {
  public:
-  explicit ThreadObserverHelper(ChromeThread::ID id)
+  explicit ThreadObserverHelper(BrowserThread::ID id)
       : id_(id), done_event_(false, false) {}
 
   void Init() {
-    DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
-    ChromeThread::PostTask(
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    BrowserThread::PostTask(
         id_,
         FROM_HERE,
         NewRunnableMethod(this, &ThreadObserverHelper::RegisterObserversTask));
@@ -31,7 +31,7 @@ class ThreadObserverHelper : public base::RefCountedThreadSafe<T, Traits> {
   }
 
   virtual ~ThreadObserverHelper() {
-    DCHECK(ChromeThread::CurrentlyOn(id_));
+    DCHECK(BrowserThread::CurrentlyOn(id_));
     registrar_.RemoveAll();
   }
 
@@ -49,23 +49,23 @@ class ThreadObserverHelper : public base::RefCountedThreadSafe<T, Traits> {
 
  private:
   void RegisterObserversTask() {
-    DCHECK(ChromeThread::CurrentlyOn(id_));
+    DCHECK(BrowserThread::CurrentlyOn(id_));
     RegisterObservers();
     done_event_.Signal();
   }
 
-  ChromeThread::ID id_;
+  BrowserThread::ID id_;
   base::WaitableEvent done_event_;
 };
 
 class DBThreadObserverHelper;
 typedef ThreadObserverHelper<
     DBThreadObserverHelper,
-    ChromeThread::DeleteOnDBThread> DBThreadObserverHelperBase;
+    BrowserThread::DeleteOnDBThread> DBThreadObserverHelperBase;
 
 class DBThreadObserverHelper : public DBThreadObserverHelperBase {
  public:
-  DBThreadObserverHelper() : DBThreadObserverHelperBase(ChromeThread::DB) {}
+  DBThreadObserverHelper() : DBThreadObserverHelperBase(BrowserThread::DB) {}
 };
 
 #endif  // CHROME_TEST_THREAD_OBSERVER_HELPER_H__
diff --git a/chrome/test/thread_test_helper.h b/chrome/test/thread_test_helper.h
index 8dd7a8c..ea5c923 100644
--- a/chrome/test/thread_test_helper.h
+++ b/chrome/test/thread_test_helper.h
@@ -17,7 +17,7 @@
 // executed.
 class ThreadTestHelper : public base::RefCountedThreadSafe<ThreadTestHelper> {
  public:
-  explicit ThreadTestHelper(ChromeThread::ID thread_id)
+  explicit ThreadTestHelper(BrowserThread::ID thread_id)
     : test_result_(false),
       thread_id_(thread_id),
       done_event_(false, false) {
@@ -25,7 +25,7 @@ class ThreadTestHelper : public base::RefCountedThreadSafe<ThreadTestHelper> {
 
   // True if RunTest() was successfully executed on the target thread.
   bool Run() WARN_UNUSED_RESULT {
-    if (!ChromeThread::PostTask(thread_id_, FROM_HERE, NewRunnableMethod(
+    if (!BrowserThread::PostTask(thread_id_, FROM_HERE, NewRunnableMethod(
         this, &ThreadTestHelper::RunInThread))) {
       return false;
     }
@@ -50,7 +50,7 @@ class ThreadTestHelper : public base::RefCountedThreadSafe<ThreadTestHelper> {
   }
 
   bool test_result_;
-  ChromeThread::ID thread_id_;
+  BrowserThread::ID thread_id_;
   base::WaitableEvent done_event_;
 
   DISALLOW_COPY_AND_ASSIGN(ThreadTestHelper);