Rename ChromeThread to BrowserThread Part13:

- Rename entries under appcache, automation, chromeos, cocoa,
file_system, metrics, policy, prefs, remoting, search_engines
and tab_contents.

BUG=56926
TEST=trybots

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

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

5 files changed, 24 insertions, 24 deletions

diff --git a/chrome/browser/prefs/pref_notifier.cc b/chrome/browser/prefs/pref_notifier.cc
index 3bb0628..7c02fc7 100644
--- a/chrome/browser/prefs/pref_notifier.cc
+++ b/chrome/browser/prefs/pref_notifier.cc
@@ -127,8 +127,8 @@ void PrefNotifier::Observe(NotificationType type,
       // The notification of the policy refresh can come from any thread,
       // but the manipulation of the PrefValueStore must happen on the UI
       // thread, thus the policy refresh must be explicitly started on it.
-      ChromeThread::PostTask(
-          ChromeThread::UI, FROM_HERE,
+      BrowserThread::PostTask(
+          BrowserThread::UI, FROM_HERE,
           NewRunnableMethod(
               pref_value_store_,
               &PrefValueStore::RefreshPolicyPrefs,
diff --git a/chrome/browser/prefs/pref_service.cc b/chrome/browser/prefs/pref_service.cc
index d807f5a4..5606d9e 100644
--- a/chrome/browser/prefs/pref_service.cc
+++ b/chrome/browser/prefs/pref_service.cc
@@ -132,7 +132,7 @@ void PrefService::InitFromStorage() {
   }
 
   if (message_id) {
-    ChromeThread::PostTask(ChromeThread::UI, FROM_HERE,
+    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
         NewRunnableFunction(&NotifyReadError, this, message_id));
   }
   UMA_HISTOGRAM_ENUMERATION("PrefService.ReadError", error, 20);
diff --git a/chrome/browser/prefs/pref_value_store.cc b/chrome/browser/prefs/pref_value_store.cc
index ff2a7a4..078aac1 100644
--- a/chrome/browser/prefs/pref_value_store.cc
+++ b/chrome/browser/prefs/pref_value_store.cc
@@ -46,7 +46,7 @@ PrefValueStore* PrefValueStore::CreatePrefValueStore(
 
   JsonPrefStore* user = new JsonPrefStore(
       pref_filename,
-      ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE));
+      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
   DefaultPrefStore* default_store = new DefaultPrefStore();
 
   if (!user_only) {
@@ -286,12 +286,12 @@ void PrefValueStore::RefreshPolicyPrefsCompletion(
 }
 
 void PrefValueStore::RefreshPolicyPrefsOnFileThread(
-    ChromeThread::ID calling_thread_id,
+    BrowserThread::ID calling_thread_id,
     PrefStore* new_managed_pref_store,
     PrefStore* new_recommended_pref_store,
     AfterRefreshCallback* callback_pointer) {
   scoped_ptr<AfterRefreshCallback> callback(callback_pointer);
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   scoped_ptr<PrefStore> managed_pref_store(new_managed_pref_store);
   scoped_ptr<PrefStore> recommended_pref_store(new_recommended_pref_store);
 
@@ -309,7 +309,7 @@ void PrefValueStore::RefreshPolicyPrefsOnFileThread(
     return;
   }
 
-  ChromeThread::PostTask(
+  BrowserThread::PostTask(
       calling_thread_id, FROM_HERE,
       NewRunnableMethod(this,
                         &PrefValueStore::RefreshPolicyPrefsCompletion,
@@ -322,10 +322,10 @@ void PrefValueStore::RefreshPolicyPrefs(
     PrefStore* new_managed_pref_store,
     PrefStore* new_recommended_pref_store,
     AfterRefreshCallback* callback) {
-  ChromeThread::ID current_thread_id;
-  CHECK(ChromeThread::GetCurrentThreadIdentifier(&current_thread_id));
-  ChromeThread::PostTask(
-      ChromeThread::FILE, FROM_HERE,
+  BrowserThread::ID current_thread_id;
+  CHECK(BrowserThread::GetCurrentThreadIdentifier(&current_thread_id));
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(this,
                         &PrefValueStore::RefreshPolicyPrefsOnFileThread,
                         current_thread_id,
diff --git a/chrome/browser/prefs/pref_value_store.h b/chrome/browser/prefs/pref_value_store.h
index 1dd4abb..8903eae 100644
--- a/chrome/browser/prefs/pref_value_store.h
+++ b/chrome/browser/prefs/pref_value_store.h
@@ -217,7 +217,7 @@ class PrefValueStore : public base::RefCountedThreadSafe<PrefValueStore> {
   // Called during policy refresh to do the ReadPrefs on the FILE thread.
   // RefreshPolicyPrefsOnFileThread takes ownership of the |callback| object.
   void RefreshPolicyPrefsOnFileThread(
-      ChromeThread::ID calling_thread_id,
+      BrowserThread::ID calling_thread_id,
       PrefStore* new_managed_pref_store,
       PrefStore* new_recommended_pref_store,
       AfterRefreshCallback* callback);
diff --git a/chrome/browser/prefs/pref_value_store_unittest.cc b/chrome/browser/prefs/pref_value_store_unittest.cc
index fcb5b60..e7f182f 100644
--- a/chrome/browser/prefs/pref_value_store_unittest.cc
+++ b/chrome/browser/prefs/pref_value_store_unittest.cc
@@ -133,8 +133,8 @@ class PrefValueStoreTest : public testing::Test {
     pref_value_store_->RegisterPreferenceType(prefs::kDefaultPref,
                                               Value::TYPE_INTEGER);
 
-    ui_thread_.reset(new ChromeThread(ChromeThread::UI, &loop_));
-    file_thread_.reset(new ChromeThread(ChromeThread::FILE, &loop_));
+    ui_thread_.reset(new BrowserThread(BrowserThread::UI, &loop_));
+    file_thread_.reset(new BrowserThread(BrowserThread::FILE, &loop_));
   }
 
   // Creates a new dictionary and stores some sample user preferences
@@ -250,8 +250,8 @@ class PrefValueStoreTest : public testing::Test {
   DictionaryValue* default_prefs_;
 
  private:
-  scoped_ptr<ChromeThread> ui_thread_;
-  scoped_ptr<ChromeThread> file_thread_;
+  scoped_ptr<BrowserThread> ui_thread_;
+  scoped_ptr<BrowserThread> file_thread_;
 };
 
 TEST_F(PrefValueStoreTest, IsReadOnly) {
@@ -640,8 +640,8 @@ TEST_F(PrefValueStoreTest, TestPolicyRefresh) {
   // recommended stores should change.
   MockPolicyRefreshCallback callback;
   EXPECT_CALL(callback, DoCallback(_)).Times(0);
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(
           pref_value_store_.get(),
           &PrefValueStore::RefreshPolicyPrefs,
@@ -718,8 +718,8 @@ TEST_F(PrefValueStoreTest, TestRefreshPolicyPrefsCompletion) {
 
 TEST_F(PrefValueStoreTest, TestConcurrentPolicyRefresh) {
   MockPolicyRefreshCallback callback1;
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(
           pref_value_store_.get(),
           &PrefValueStore::RefreshPolicyPrefs,
@@ -730,8 +730,8 @@ TEST_F(PrefValueStoreTest, TestConcurrentPolicyRefresh) {
   EXPECT_CALL(callback1, DoCallback(_)).Times(0);
 
   MockPolicyRefreshCallback callback2;
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(
           pref_value_store_.get(),
           &PrefValueStore::RefreshPolicyPrefs,
@@ -742,8 +742,8 @@ TEST_F(PrefValueStoreTest, TestConcurrentPolicyRefresh) {
   EXPECT_CALL(callback2, DoCallback(_)).Times(0);
 
   MockPolicyRefreshCallback callback3;
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(
           pref_value_store_.get(),
           &PrefValueStore::RefreshPolicyPrefs,