Rename ChromeThread to BrowserThread Part6:

- Rename entries under renderer_host and ssl.

BUG=56926
TEST=trybots

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

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

27 files changed, 291 insertions, 291 deletions

diff --git a/chrome/browser/renderer_host/audio_renderer_host.cc b/chrome/browser/renderer_host/audio_renderer_host.cc
index efe0d95..8e0fdc5 100644
--- a/chrome/browser/renderer_host/audio_renderer_host.cc
+++ b/chrome/browser/renderer_host/audio_renderer_host.cc
@@ -79,7 +79,7 @@ AudioRendererHost::AudioRendererHost()
 }
 
 AudioRendererHost::~AudioRendererHost() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(audio_entries_.empty());
 
   // Make sure we received IPCChannelClosing() signal.
@@ -90,8 +90,8 @@ AudioRendererHost::~AudioRendererHost() {
 void AudioRendererHost::Destroy() {
   // Post a message to the thread where this object should live and do the
   // actual operations there.
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(this, &AudioRendererHost::DoDestroy));
 }
 
@@ -99,7 +99,7 @@ void AudioRendererHost::Destroy() {
 void AudioRendererHost::IPCChannelConnected(int process_id,
                                             base::ProcessHandle process_handle,
                                             IPC::Message::Sender* ipc_sender) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   process_handle_ = process_handle;
   ipc_sender_ = ipc_sender;
@@ -107,7 +107,7 @@ void AudioRendererHost::IPCChannelConnected(int process_id,
 
 // Event received when IPC channel is closing.
 void AudioRendererHost::IPCChannelClosing() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // Reset IPC related member variables.
   ipc_sender_ = NULL;
@@ -120,8 +120,8 @@ void AudioRendererHost::IPCChannelClosing() {
 ///////////////////////////////////////////////////////////////////////////////
 // media::AudioOutputController::EventHandler implementations.
 void AudioRendererHost::OnCreated(media::AudioOutputController* controller) {
-  ChromeThread::PostTask(
-      ChromeThread::IO,
+  BrowserThread::PostTask(
+      BrowserThread::IO,
       FROM_HERE,
       NewRunnableMethod(
           this,
@@ -130,8 +130,8 @@ void AudioRendererHost::OnCreated(media::AudioOutputController* controller) {
 }
 
 void AudioRendererHost::OnPlaying(media::AudioOutputController* controller) {
-  ChromeThread::PostTask(
-      ChromeThread::IO,
+  BrowserThread::PostTask(
+      BrowserThread::IO,
       FROM_HERE,
       NewRunnableMethod(
           this,
@@ -140,8 +140,8 @@ void AudioRendererHost::OnPlaying(media::AudioOutputController* controller) {
 }
 
 void AudioRendererHost::OnPaused(media::AudioOutputController* controller) {
-  ChromeThread::PostTask(
-      ChromeThread::IO,
+  BrowserThread::PostTask(
+      BrowserThread::IO,
       FROM_HERE,
       NewRunnableMethod(
           this,
@@ -151,8 +151,8 @@ void AudioRendererHost::OnPaused(media::AudioOutputController* controller) {
 
 void AudioRendererHost::OnError(media::AudioOutputController* controller,
                                 int error_code) {
-  ChromeThread::PostTask(
-      ChromeThread::IO,
+  BrowserThread::PostTask(
+      BrowserThread::IO,
       FROM_HERE,
       NewRunnableMethod(this,
                         &AudioRendererHost::DoHandleError,
@@ -162,8 +162,8 @@ void AudioRendererHost::OnError(media::AudioOutputController* controller,
 
 void AudioRendererHost::OnMoreData(media::AudioOutputController* controller,
                                    AudioBuffersState buffers_state) {
-  ChromeThread::PostTask(
-      ChromeThread::IO,
+  BrowserThread::PostTask(
+      BrowserThread::IO,
       FROM_HERE,
       NewRunnableMethod(this,
                         &AudioRendererHost::DoRequestMoreData,
@@ -173,7 +173,7 @@ void AudioRendererHost::OnMoreData(media::AudioOutputController* controller,
 
 void AudioRendererHost::DoCompleteCreation(
     media::AudioOutputController* controller) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupByController(controller);
   if (!entry)
@@ -229,7 +229,7 @@ void AudioRendererHost::DoCompleteCreation(
 
 void AudioRendererHost::DoSendPlayingMessage(
     media::AudioOutputController* controller) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupByController(controller);
   if (!entry)
@@ -243,7 +243,7 @@ void AudioRendererHost::DoSendPlayingMessage(
 
 void AudioRendererHost::DoSendPausedMessage(
     media::AudioOutputController* controller) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupByController(controller);
   if (!entry)
@@ -258,7 +258,7 @@ void AudioRendererHost::DoSendPausedMessage(
 void AudioRendererHost::DoRequestMoreData(
     media::AudioOutputController* controller,
     AudioBuffersState buffers_state) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // If we already have a pending request then return.
   AudioEntry* entry = LookupByController(controller);
@@ -274,7 +274,7 @@ void AudioRendererHost::DoRequestMoreData(
 
 void AudioRendererHost::DoHandleError(media::AudioOutputController* controller,
                                       int error_code) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupByController(controller);
   if (!entry)
@@ -326,7 +326,7 @@ bool AudioRendererHost::IsAudioRendererHostMessage(
 void AudioRendererHost::OnCreateStream(
     const IPC::Message& msg, int stream_id,
     const ViewHostMsg_Audio_CreateStream_Params& params, bool low_latency) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(LookupById(msg.routing_id(), stream_id) == NULL);
 
   // Limit the number of audio streams opened. This is to prevent using
@@ -396,7 +396,7 @@ void AudioRendererHost::OnCreateStream(
 }
 
 void AudioRendererHost::OnPlayStream(const IPC::Message& msg, int stream_id) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupById(msg.routing_id(), stream_id);
   if (!entry) {
@@ -408,7 +408,7 @@ void AudioRendererHost::OnPlayStream(const IPC::Message& msg, int stream_id) {
 }
 
 void AudioRendererHost::OnPauseStream(const IPC::Message& msg, int stream_id) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupById(msg.routing_id(), stream_id);
   if (!entry) {
@@ -420,7 +420,7 @@ void AudioRendererHost::OnPauseStream(const IPC::Message& msg, int stream_id) {
 }
 
 void AudioRendererHost::OnFlushStream(const IPC::Message& msg, int stream_id) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupById(msg.routing_id(), stream_id);
   if (!entry) {
@@ -432,7 +432,7 @@ void AudioRendererHost::OnFlushStream(const IPC::Message& msg, int stream_id) {
 }
 
 void AudioRendererHost::OnCloseStream(const IPC::Message& msg, int stream_id) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupById(msg.routing_id(), stream_id);
 
@@ -442,7 +442,7 @@ void AudioRendererHost::OnCloseStream(const IPC::Message& msg, int stream_id) {
 
 void AudioRendererHost::OnSetVolume(const IPC::Message& msg, int stream_id,
                                     double volume) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupById(msg.routing_id(), stream_id);
   if (!entry) {
@@ -456,13 +456,13 @@ void AudioRendererHost::OnSetVolume(const IPC::Message& msg, int stream_id,
 }
 
 void AudioRendererHost::OnGetVolume(const IPC::Message& msg, int stream_id) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   NOTREACHED() << "This message shouldn't be received";
 }
 
 void AudioRendererHost::OnNotifyPacketReady(
     const IPC::Message& msg, int stream_id, uint32 packet_size) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupById(msg.routing_id(), stream_id);
   if (!entry) {
@@ -485,7 +485,7 @@ void AudioRendererHost::OnNotifyPacketReady(
 }
 
 void AudioRendererHost::DoDestroy() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // Reset IPC releated members.
   ipc_sender_ = NULL;
@@ -499,7 +499,7 @@ void AudioRendererHost::DoDestroy() {
 }
 
 void AudioRendererHost::SendMessage(IPC::Message* message) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (ipc_sender_)
     ipc_sender_->Send(message);
@@ -514,7 +514,7 @@ void AudioRendererHost::SendErrorMessage(int32 render_view_id,
 }
 
 void AudioRendererHost::DeleteEntries() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   for (AudioEntryMap::iterator i = audio_entries_.begin();
        i != audio_entries_.end(); ++i) {
@@ -532,13 +532,13 @@ void AudioRendererHost::CloseAndDeleteStream(AudioEntry* entry) {
 
 void AudioRendererHost::OnStreamClosed(AudioEntry* entry) {
   // Delete the entry after we've closed the stream.
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(this, &AudioRendererHost::DeleteEntry, entry));
 }
 
 void AudioRendererHost::DeleteEntry(AudioEntry* entry) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // Delete the entry when this method goes out of scope.
   scoped_ptr<AudioEntry> entry_deleter(entry);
@@ -549,7 +549,7 @@ void AudioRendererHost::DeleteEntry(AudioEntry* entry) {
 }
 
 void AudioRendererHost::DeleteEntryOnError(AudioEntry* entry) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // Sends the error message first before we close the stream because
   // |entry| is destroyed in DeleteEntry().
@@ -559,7 +559,7 @@ void AudioRendererHost::DeleteEntryOnError(AudioEntry* entry) {
 
 AudioRendererHost::AudioEntry* AudioRendererHost::LookupById(
     int route_id, int stream_id) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntryMap::iterator i = audio_entries_.find(
       AudioEntryId(route_id, stream_id));
@@ -570,7 +570,7 @@ AudioRendererHost::AudioEntry* AudioRendererHost::LookupById(
 
 AudioRendererHost::AudioEntry* AudioRendererHost::LookupByController(
     media::AudioOutputController* controller) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // Iterate the map of entries.
   // TODO(hclam): Implement a faster look up method.
diff --git a/chrome/browser/renderer_host/audio_renderer_host.h b/chrome/browser/renderer_host/audio_renderer_host.h
index 105795b..751bf5c 100644
--- a/chrome/browser/renderer_host/audio_renderer_host.h
+++ b/chrome/browser/renderer_host/audio_renderer_host.h
@@ -77,7 +77,7 @@ struct ViewHostMsg_Audio_CreateStream_Params;
 
 class AudioRendererHost : public base::RefCountedThreadSafe<
                               AudioRendererHost,
-                              ChromeThread::DeleteOnIOThread>,
+                              BrowserThread::DeleteOnIOThread>,
                           public media::AudioOutputController::EventHandler {
  public:
   typedef std::pair<int32, int> AudioEntryId;
diff --git a/chrome/browser/renderer_host/audio_renderer_host_unittest.cc b/chrome/browser/renderer_host/audio_renderer_host_unittest.cc
index 334f932..3181976 100644
--- a/chrome/browser/renderer_host/audio_renderer_host_unittest.cc
+++ b/chrome/browser/renderer_host/audio_renderer_host_unittest.cc
@@ -171,7 +171,7 @@ class AudioRendererHostTest : public testing::Test {
   virtual void SetUp() {
     // Create a message loop so AudioRendererHost can use it.
     message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO));
-    io_thread_.reset(new ChromeThread(ChromeThread::IO, message_loop_.get()));
+    io_thread_.reset(new BrowserThread(BrowserThread::IO, message_loop_.get()));
     host_ = new MockAudioRendererHost();
 
     // Simulate IPC channel connected.
@@ -349,7 +349,7 @@ class AudioRendererHostTest : public testing::Test {
   bool mock_stream_;
   scoped_refptr<MockAudioRendererHost> host_;
   scoped_ptr<MessageLoop> message_loop_;
-  scoped_ptr<ChromeThread> io_thread_;
+  scoped_ptr<BrowserThread> io_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererHostTest);
 };
diff --git a/chrome/browser/renderer_host/blob_dispatcher_host.cc b/chrome/browser/renderer_host/blob_dispatcher_host.cc
index 4e6a2e6..fe6fef1 100644
--- a/chrome/browser/renderer_host/blob_dispatcher_host.cc
+++ b/chrome/browser/renderer_host/blob_dispatcher_host.cc
@@ -24,7 +24,7 @@ BlobDispatcherHost::~BlobDispatcherHost() {
 }
 
 void BlobDispatcherHost::Shutdown() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // Unregister all the blob URLs that are previously registered in this
   // process.
@@ -36,7 +36,7 @@ void BlobDispatcherHost::Shutdown() {
 
 bool BlobDispatcherHost::OnMessageReceived(const IPC::Message& message,
                                            bool* msg_is_ok) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   *msg_is_ok = true;
   bool handled = true;
@@ -67,7 +67,7 @@ bool BlobDispatcherHost::CheckPermission(
 
 void BlobDispatcherHost::OnRegisterBlobUrl(
     const GURL& url, const scoped_refptr<webkit_blob::BlobData>& blob_data) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!CheckPermission(blob_data.get()))
     return;
   blob_storage_context_->controller()->RegisterBlobUrl(url, blob_data);
@@ -76,13 +76,13 @@ void BlobDispatcherHost::OnRegisterBlobUrl(
 
 void BlobDispatcherHost::OnRegisterBlobUrlFrom(
     const GURL& url, const GURL& src_url) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   blob_storage_context_->controller()->RegisterBlobUrlFrom(url, src_url);
   blob_urls_.insert(url.spec());
 }
 
 void BlobDispatcherHost::OnUnregisterBlobUrl(const GURL& url) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   blob_storage_context_->controller()->UnregisterBlobUrl(url);
   blob_urls_.erase(url.spec());
 }
diff --git a/chrome/browser/renderer_host/buffered_resource_handler.cc b/chrome/browser/renderer_host/buffered_resource_handler.cc
index 1dbcd3a..1949094 100644
--- a/chrome/browser/renderer_host/buffered_resource_handler.cc
+++ b/chrome/browser/renderer_host/buffered_resource_handler.cc
@@ -363,8 +363,8 @@ bool BufferedResourceHandler::ShouldWaitForPlugins() {
   host_->PauseRequest(info->child_id(), info->request_id(), true);
 
   // Schedule plugin loading on the file thread.
-  ChromeThread::PostTask(
-      ChromeThread::FILE, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(this, &BufferedResourceHandler::LoadPlugins));
   return true;
 }
@@ -468,8 +468,8 @@ void BufferedResourceHandler::LoadPlugins() {
   std::vector<WebPluginInfo> plugins;
   NPAPI::PluginList::Singleton()->GetPlugins(false, &plugins);
 
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(this, &BufferedResourceHandler::OnPluginsLoaded));
 }
 
diff --git a/chrome/browser/renderer_host/database_dispatcher_host.cc b/chrome/browser/renderer_host/database_dispatcher_host.cc
index 3efb836..c4989a2 100644
--- a/chrome/browser/renderer_host/database_dispatcher_host.cc
+++ b/chrome/browser/renderer_host/database_dispatcher_host.cc
@@ -45,7 +45,7 @@ DatabaseDispatcherHost::DatabaseDispatcherHost(
 }
 
 void DatabaseDispatcherHost::Init(base::ProcessHandle process_handle) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(!shutdown_);
   DCHECK(!process_handle_);
   DCHECK(process_handle);
@@ -57,19 +57,19 @@ void DatabaseDispatcherHost::Shutdown() {
   message_sender_ = NULL;
   if (observer_added_) {
     observer_added_ = false;
-    ChromeThread::PostTask(
-        ChromeThread::FILE, FROM_HERE,
+    BrowserThread::PostTask(
+        BrowserThread::FILE, FROM_HERE,
         NewRunnableMethod(this, &DatabaseDispatcherHost::RemoveObserver));
   }
 }
 
 void DatabaseDispatcherHost::AddObserver() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   db_tracker_->AddObserver(this);
 }
 
 void DatabaseDispatcherHost::RemoveObserver() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   // If the renderer process died without closing all databases,
   // then we need to manually close those connections
@@ -108,9 +108,9 @@ void DatabaseDispatcherHost::ReceivedBadMessage(uint32 msg_type) {
 }
 
 void DatabaseDispatcherHost::Send(IPC::Message* message) {
-  if (!ChromeThread::CurrentlyOn(ChromeThread::IO)) {
-    if (!ChromeThread::PostTask(
-            ChromeThread::IO, FROM_HERE,
+  if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
+    if (!BrowserThread::PostTask(
+            BrowserThread::IO, FROM_HERE,
             NewRunnableMethod(this,
                               &DatabaseDispatcherHost::Send,
                               message)))
@@ -129,13 +129,13 @@ void DatabaseDispatcherHost::OnDatabaseOpenFile(const string16& vfs_file_name,
                                                 IPC::Message* reply_msg) {
   if (!observer_added_) {
     observer_added_ = true;
-    ChromeThread::PostTask(
-        ChromeThread::FILE, FROM_HERE,
+    BrowserThread::PostTask(
+        BrowserThread::FILE, FROM_HERE,
         NewRunnableMethod(this, &DatabaseDispatcherHost::AddObserver));
   }
 
-  ChromeThread::PostTask(
-      ChromeThread::FILE, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(this,
                         &DatabaseDispatcherHost::DatabaseOpenFile,
                         vfs_file_name,
@@ -150,7 +150,7 @@ void DatabaseDispatcherHost::OnDatabaseOpenFile(const string16& vfs_file_name,
 void DatabaseDispatcherHost::DatabaseOpenFile(const string16& vfs_file_name,
                                               int desired_flags,
                                               IPC::Message* reply_msg) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   base::PlatformFile file_handle = base::kInvalidPlatformFileValue;
   base::PlatformFile target_handle = base::kInvalidPlatformFileValue;
   string16 origin_identifier;
@@ -208,8 +208,8 @@ void DatabaseDispatcherHost::DatabaseOpenFile(const string16& vfs_file_name,
 void DatabaseDispatcherHost::OnDatabaseDeleteFile(const string16& vfs_file_name,
                                                   const bool& sync_dir,
                                                   IPC::Message* reply_msg) {
-  ChromeThread::PostTask(
-      ChromeThread::FILE, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(this,
                         &DatabaseDispatcherHost::DatabaseDeleteFile,
                         vfs_file_name,
@@ -226,7 +226,7 @@ void DatabaseDispatcherHost::DatabaseDeleteFile(const string16& vfs_file_name,
                                                 bool sync_dir,
                                                 IPC::Message* reply_msg,
                                                 int reschedule_count) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   // Return an error if the file name is invalid or if the file could not
   // be deleted after kNumDeleteRetries attempts.
@@ -245,8 +245,8 @@ void DatabaseDispatcherHost::DatabaseDeleteFile(const string16& vfs_file_name,
 
     if ((error_code == SQLITE_IOERR_DELETE) && reschedule_count) {
       // If the file could not be deleted, try again.
-      ChromeThread::PostDelayedTask(
-          ChromeThread::FILE, FROM_HERE,
+      BrowserThread::PostDelayedTask(
+          BrowserThread::FILE, FROM_HERE,
           NewRunnableMethod(this,
                             &DatabaseDispatcherHost::DatabaseDeleteFile,
                             vfs_file_name,
@@ -265,8 +265,8 @@ void DatabaseDispatcherHost::DatabaseDeleteFile(const string16& vfs_file_name,
 void DatabaseDispatcherHost::OnDatabaseGetFileAttributes(
     const string16& vfs_file_name,
     IPC::Message* reply_msg) {
-  ChromeThread::PostTask(
-      ChromeThread::FILE, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(this,
                         &DatabaseDispatcherHost::DatabaseGetFileAttributes,
                         vfs_file_name,
@@ -280,7 +280,7 @@ void DatabaseDispatcherHost::OnDatabaseGetFileAttributes(
 void DatabaseDispatcherHost::DatabaseGetFileAttributes(
     const string16& vfs_file_name,
     IPC::Message* reply_msg) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   int32 attributes = -1;
   FilePath db_file =
       DatabaseUtil::GetFullFilePathForVfsFile(db_tracker_, vfs_file_name);
@@ -294,8 +294,8 @@ void DatabaseDispatcherHost::DatabaseGetFileAttributes(
 
 void DatabaseDispatcherHost::OnDatabaseGetFileSize(
   const string16& vfs_file_name, IPC::Message* reply_msg) {
-  ChromeThread::PostTask(
-      ChromeThread::FILE, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(this,
                         &DatabaseDispatcherHost::DatabaseGetFileSize,
                         vfs_file_name,
@@ -308,7 +308,7 @@ void DatabaseDispatcherHost::OnDatabaseGetFileSize(
 // the corresponding renderer process.
 void DatabaseDispatcherHost::DatabaseGetFileSize(const string16& vfs_file_name,
                                                  IPC::Message* reply_msg) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   int64 size = 0;
   FilePath db_file =
       DatabaseUtil::GetFullFilePathForVfsFile(db_tracker_, vfs_file_name);
@@ -323,8 +323,8 @@ void DatabaseDispatcherHost::OnDatabaseOpened(const string16& origin_identifier,
                                               const string16& database_name,
                                               const string16& description,
                                               int64 estimated_size) {
-  ChromeThread::PostTask(
-      ChromeThread::FILE, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(this,
                         &DatabaseDispatcherHost::DatabaseOpened,
                         origin_identifier,
@@ -337,7 +337,7 @@ void DatabaseDispatcherHost::DatabaseOpened(const string16& origin_identifier,
                                             const string16& database_name,
                                             const string16& description,
                                             int64 estimated_size) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   int64 database_size = 0;
   int64 space_available = 0;
   database_connections_.AddConnection(origin_identifier, database_name);
@@ -350,8 +350,8 @@ void DatabaseDispatcherHost::DatabaseOpened(const string16& origin_identifier,
 void DatabaseDispatcherHost::OnDatabaseModified(
     const string16& origin_identifier,
     const string16& database_name) {
-  ChromeThread::PostTask(
-      ChromeThread::FILE, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(this,
                         &DatabaseDispatcherHost::DatabaseModified,
                         origin_identifier,
@@ -360,7 +360,7 @@ void DatabaseDispatcherHost::OnDatabaseModified(
 
 void DatabaseDispatcherHost::DatabaseModified(const string16& origin_identifier,
                                               const string16& database_name) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   if (!database_connections_.IsDatabaseOpened(
           origin_identifier, database_name)) {
     ReceivedBadMessage(ViewHostMsg_DatabaseModified::ID);
@@ -372,8 +372,8 @@ void DatabaseDispatcherHost::DatabaseModified(const string16& origin_identifier,
 
 void DatabaseDispatcherHost::OnDatabaseClosed(const string16& origin_identifier,
                                               const string16& database_name) {
-  ChromeThread::PostTask(
-      ChromeThread::FILE, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(this,
                         &DatabaseDispatcherHost::DatabaseClosed,
                         origin_identifier,
@@ -404,7 +404,7 @@ void DatabaseDispatcherHost::AllowDatabaseResponse(
 
 void DatabaseDispatcherHost::DatabaseClosed(const string16& origin_identifier,
                                             const string16& database_name) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   if (!database_connections_.IsDatabaseOpened(
           origin_identifier, database_name)) {
     ReceivedBadMessage(ViewHostMsg_DatabaseClosed::ID);
@@ -420,7 +420,7 @@ void DatabaseDispatcherHost::OnDatabaseSizeChanged(
     const string16& database_name,
     int64 database_size,
     int64 space_available) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   if (database_connections_.IsOriginUsed(origin_identifier)) {
     Send(new ViewMsg_DatabaseUpdateSize(origin_identifier, database_name,
                                         database_size, space_available));
@@ -430,6 +430,6 @@ void DatabaseDispatcherHost::OnDatabaseSizeChanged(
 void DatabaseDispatcherHost::OnDatabaseScheduledForDeletion(
     const string16& origin_identifier,
     const string16& database_name) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   Send(new ViewMsg_DatabaseCloseImmediately(origin_identifier, database_name));
 }
diff --git a/chrome/browser/renderer_host/download_resource_handler.cc b/chrome/browser/renderer_host/download_resource_handler.cc
index 5e83478..c1c13d7 100644
--- a/chrome/browser/renderer_host/download_resource_handler.cc
+++ b/chrome/browser/renderer_host/download_resource_handler.cc
@@ -91,8 +91,8 @@ bool DownloadResourceHandler::OnResponseStarted(int request_id,
   info->is_dangerous = false;
   info->referrer_charset = request_->context()->referrer_charset();
   info->save_info = save_info_;
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(
           download_file_manager_, &DownloadFileManager::StartDownload, info));
 
@@ -135,8 +135,8 @@ bool DownloadResourceHandler::OnReadCompleted(int request_id, int* bytes_read) {
   read_buffer_.swap(&buffer);
   buffer_->contents.push_back(std::make_pair(buffer, *bytes_read));
   if (need_update) {
-    ChromeThread::PostTask(
-        ChromeThread::FILE, FROM_HERE,
+    BrowserThread::PostTask(
+        BrowserThread::FILE, FROM_HERE,
         NewRunnableMethod(download_file_manager_,
                           &DownloadFileManager::UpdateDownload,
                           download_id_,
@@ -155,8 +155,8 @@ bool DownloadResourceHandler::OnResponseCompleted(
     int request_id,
     const URLRequestStatus& status,
     const std::string& security_info) {
-  ChromeThread::PostTask(
-      ChromeThread::FILE, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(download_file_manager_,
                         &DownloadFileManager::OnResponseCompleted,
                         download_id_,
diff --git a/chrome/browser/renderer_host/offline_resource_handler.cc b/chrome/browser/renderer_host/offline_resource_handler.cc
index c270d14..4305294 100644
--- a/chrome/browser/renderer_host/offline_resource_handler.cc
+++ b/chrome/browser/renderer_host/offline_resource_handler.cc
@@ -70,8 +70,8 @@ bool OfflineResourceHandler::OnWillStart(int request_id,
     deferred_url_ = url;
     DLOG(INFO) << "WillStart: this=" << this << ", request id=" << request_id;
     AddRef();  //  Balanced with OnBlockingPageComplete
-    ChromeThread::PostTask(
-        ChromeThread::UI, FROM_HERE,
+    BrowserThread::PostTask(
+        BrowserThread::UI, FROM_HERE,
         NewRunnableMethod(this, &OfflineResourceHandler::ShowOfflinePage));
     *defer = true;
     return true;
@@ -98,9 +98,9 @@ void OfflineResourceHandler::OnBlockingPageComplete(bool proceed) {
     NOTREACHED();
     return;
   }
-  if (!ChromeThread::CurrentlyOn(ChromeThread::IO)) {
-    ChromeThread::PostTask(
-        ChromeThread::IO, FROM_HERE,
+  if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
+    BrowserThread::PostTask(
+        BrowserThread::IO, FROM_HERE,
         NewRunnableMethod(this,
                           &OfflineResourceHandler::OnBlockingPageComplete,
                           proceed));
diff --git a/chrome/browser/renderer_host/redirect_to_file_resource_handler.cc b/chrome/browser/renderer_host/redirect_to_file_resource_handler.cc
index 1843514..1e7d4b3 100644
--- a/chrome/browser/renderer_host/redirect_to_file_resource_handler.cc
+++ b/chrome/browser/renderer_host/redirect_to_file_resource_handler.cc
@@ -74,7 +74,7 @@ bool RedirectToFileResourceHandler::OnWillStart(int request_id,
     // network request like this.
     *defer = true;
     base::FileUtilProxy::CreateTemporary(
-        ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE),
+        BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE),
         callback_factory_.NewCallback(
             &RedirectToFileResourceHandler::DidCreateTemporaryFile));
     return true;
@@ -158,7 +158,7 @@ void RedirectToFileResourceHandler::DidCreateTemporaryFile(
     FilePath file_path) {
   deletable_file_ = DeletableFileReference::GetOrCreate(
       file_path,
-      ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE));
+      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
   file_stream_.reset(new net::FileStream(file_handle.ReleaseValue(),
                                          base::PLATFORM_FILE_WRITE |
                                          base::PLATFORM_FILE_ASYNC));
diff --git a/chrome/browser/renderer_host/render_view_host_notification_task.h b/chrome/browser/renderer_host/render_view_host_notification_task.h
index 6963341..4d30727 100644
--- a/chrome/browser/renderer_host/render_view_host_notification_task.h
+++ b/chrome/browser/renderer_host/render_view_host_notification_task.h
@@ -62,8 +62,8 @@ class RenderViewHostNotificationTask : public Task {
 template <typename Method, typename Params>
 inline void CallRenderViewHostHelper(int render_process_id, int render_view_id,
                                      Method method, const Params& params) {
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       new RenderViewHostNotificationTask<Method, Params>(render_process_id,
                                                          render_view_id,
                                                          method,
@@ -86,8 +86,8 @@ inline void CallRenderViewHostResourceDelegateHelper(int render_process_id,
                                                      Method method,
                                                      const Params& params) {
 
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       new RenderViewHostNotificationTask<
           Method, Params, RenderViewHostToResourceDelegate>(render_process_id,
                                                             render_view_id,
@@ -112,8 +112,8 @@ inline void CallRenderViewHostContentSettingsDelegateHelper(
     Method method,
     const Params& params) {
 
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       new RenderViewHostNotificationTask<
           Method, Params, RenderViewHostToContentSettingsDelegate>(
               render_process_id,
@@ -138,8 +138,8 @@ inline void CallRenderViewHostRendererManagementDelegateHelper(
     int render_view_id,
     Method method,
     const Params& params) {
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       new RenderViewHostNotificationTask<
           Method, Params, RenderViewHostToRendererManagementDelegate>(
               render_process_id,
@@ -164,8 +164,8 @@ inline void CallRenderViewHostSSLDelegateHelper(
     int render_view_id,
     Method method,
     const Params& params) {
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       new RenderViewHostNotificationTask<
           Method, Params, RenderViewHostToSSLDelegate>(
               render_process_id,
diff --git a/chrome/browser/renderer_host/render_widget_helper.cc b/chrome/browser/renderer_host/render_widget_helper.cc
index 286fa42..f63ddfb 100644
--- a/chrome/browser/renderer_host/render_widget_helper.cc
+++ b/chrome/browser/renderer_host/render_widget_helper.cc
@@ -78,8 +78,8 @@ void RenderWidgetHelper::CancelResourceRequests(int render_widget_id) {
   if (render_process_id_ == -1)
     return;
 
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(this,
                         &RenderWidgetHelper::OnCancelResourceRequests,
                         render_widget_id));
@@ -87,8 +87,8 @@ void RenderWidgetHelper::CancelResourceRequests(int render_widget_id) {
 
 void RenderWidgetHelper::CrossSiteClosePageACK(
     const ViewMsg_ClosePage_Params& params) {
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(this,
                         &RenderWidgetHelper::OnCrossSiteClosePageACK,
                         params));
@@ -161,7 +161,7 @@ void RenderWidgetHelper::DidReceiveUpdateMsg(const IPC::Message& msg) {
   event_.Signal();
 
   // The proxy will be deleted when it is run as a task.
-  ChromeThread::PostTask(ChromeThread::UI, FROM_HERE, proxy);
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, proxy);
 }
 
 void RenderWidgetHelper::OnDiscardUpdateMsg(UpdateMsgProxy* proxy) {
@@ -212,8 +212,8 @@ void RenderWidgetHelper::CreateNewWindow(
   resource_dispatcher_host_->BlockRequestsForRoute(
       render_process_id_, *route_id);
 
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(
           this, &RenderWidgetHelper::OnCreateWindowOnUI, opener_id, *route_id,
           window_container_type, frame_name));
@@ -228,8 +228,8 @@ void RenderWidgetHelper::OnCreateWindowOnUI(
   if (host)
     host->CreateNewWindow(route_id, window_container_type, frame_name);
 
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(this, &RenderWidgetHelper::OnCreateWindowOnIO,
                         route_id));
 }
@@ -243,8 +243,8 @@ void RenderWidgetHelper::CreateNewWidget(int opener_id,
                                          WebKit::WebPopupType popup_type,
                                          int* route_id) {
   *route_id = GetNextRoutingID();
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(
           this, &RenderWidgetHelper::OnCreateWidgetOnUI, opener_id, *route_id,
           popup_type));
@@ -253,8 +253,8 @@ void RenderWidgetHelper::CreateNewWidget(int opener_id,
 void RenderWidgetHelper::CreateNewFullscreenWidget(
     int opener_id, WebKit::WebPopupType popup_type, int* route_id) {
   *route_id = GetNextRoutingID();
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(
           this, &RenderWidgetHelper::OnCreateFullscreenWidgetOnUI,
           opener_id, *route_id, popup_type));
diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.mm b/chrome/browser/renderer_host/render_widget_host_view_mac.mm
index bd84427..05111df 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm
@@ -533,7 +533,7 @@ gfx::NativeView RenderWidgetHostViewMac::GetNativeView() {
 
 void RenderWidgetHostViewMac::MovePluginWindows(
     const std::vector<webkit_glue::WebPluginGeometry>& moves) {
-  CHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+  CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // Handle movement of accelerated plugins, which are the only "windowed"
   // plugins that exist on the Mac.
   for (std::vector<webkit_glue::WebPluginGeometry>::const_iterator iter =
@@ -877,7 +877,7 @@ void RenderWidgetHostViewMac::KillSelf() {
 gfx::PluginWindowHandle
 RenderWidgetHostViewMac::AllocateFakePluginWindowHandle(bool opaque,
                                                         bool root) {
-  CHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+  CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // Create an NSView to host the plugin's/compositor's pixels.
   gfx::PluginWindowHandle handle =
       plugin_container_manager_.AllocateFakePluginWindowHandle(opaque, root);
@@ -895,7 +895,7 @@ RenderWidgetHostViewMac::AllocateFakePluginWindowHandle(bool opaque,
 
 void RenderWidgetHostViewMac::DestroyFakePluginWindowHandle(
     gfx::PluginWindowHandle window) {
-  CHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+  CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   PluginViewMap::iterator it = plugin_views_.find(window);
   DCHECK(plugin_views_.end() != it);
   if (plugin_views_.end() == it) {
@@ -920,7 +920,7 @@ void RenderWidgetHostViewMac::AcceleratedSurfaceSetIOSurface(
     int32 width,
     int32 height,
     uint64 io_surface_identifier) {
-  CHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+  CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   plugin_container_manager_.SetSizeAndIOSurface(window,
                                                 width,
                                                 height,
@@ -945,7 +945,7 @@ void RenderWidgetHostViewMac::AcceleratedSurfaceSetTransportDIB(
     int32 width,
     int32 height,
     TransportDIB::Handle transport_dib) {
-  CHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+  CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   plugin_container_manager_.SetSizeAndTransportDIB(window,
                                                    width,
                                                    height,
@@ -954,7 +954,7 @@ void RenderWidgetHostViewMac::AcceleratedSurfaceSetTransportDIB(
 
 void RenderWidgetHostViewMac::AcceleratedSurfaceBuffersSwapped(
     gfx::PluginWindowHandle window) {
-  CHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+  CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   PluginViewMap::iterator it = plugin_views_.find(window);
   DCHECK(plugin_views_.end() != it);
   if (plugin_views_.end() == it) {
@@ -972,7 +972,7 @@ void RenderWidgetHostViewMac::AcceleratedSurfaceBuffersSwapped(
 }
 
 void RenderWidgetHostViewMac::GpuRenderingStateDidChange() {
-  CHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+  CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // Plugins are destroyed on page navigate. The compositor layer on the other
   // hand is created on demand and then stays alive until its renderer process
   // dies (usually on cross-domain navigation). Instead, only a flag
diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc
index e22033f..c74f367 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_win.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc
@@ -510,8 +510,8 @@ HWND RenderWidgetHostViewWin::ReparentWindow(HWND window) {
       0, 0, 0, 0, ::GetParent(window), 0, GetModuleHandle(NULL), 0);
   DCHECK(parent);
   ::SetParent(window, parent);
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       new NotifyPluginProcessHostTask(window, parent));
   return parent;
 }
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc
index ec6b1d8..fea8407 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc
@@ -241,17 +241,17 @@ ResourceDispatcherHost::~ResourceDispatcherHost() {
 }
 
 void ResourceDispatcherHost::Initialize() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   webkit_thread_->Initialize();
   safe_browsing_->Initialize();
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableFunction(&appcache::AppCacheInterceptor::EnsureRegistered));
 }
 
 void ResourceDispatcherHost::Shutdown() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
-  ChromeThread::PostTask(ChromeThread::IO, FROM_HERE, new ShutdownTask(this));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, new ShutdownTask(this));
 }
 
 void ResourceDispatcherHost::SetRequestInfo(
@@ -261,7 +261,7 @@ void ResourceDispatcherHost::SetRequestInfo(
 }
 
 void ResourceDispatcherHost::OnShutdown() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   is_shutdown_ = true;
   resource_queue_.Shutdown();
   STLDeleteValues(&pending_requests_);
@@ -297,8 +297,8 @@ bool ResourceDispatcherHost::HandleExternalProtocol(int request_id,
   if (!ResourceType::IsFrame(type) || URLRequest::IsHandledURL(url))
     return false;
 
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       NewRunnableFunction(
           &ExternalProtocolHandler::LaunchUrl, url, child_id, route_id));
 
@@ -1561,7 +1561,7 @@ void ResourceDispatcherHost::RemoveObserver(Observer* obs) {
 URLRequest* ResourceDispatcherHost::GetURLRequest(
     const GlobalRequestID& request_id) const {
   // This should be running in the IO loop.
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   PendingRequestList::const_iterator i = pending_requests_.find(request_id);
   if (i == pending_requests_.end())
@@ -1745,7 +1745,7 @@ void ResourceDispatcherHost::UpdateLoadStates() {
 
   LoadInfoUpdateTask* task = new LoadInfoUpdateTask;
   task->info_map.swap(info_map);
-  ChromeThread::PostTask(ChromeThread::UI, FROM_HERE, task);
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, task);
 }
 
 // Calls the ResourceHandler to send upload progress messages to the renderer.
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc b/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
index f05d1114..d3748c1 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
@@ -158,8 +158,8 @@ class ResourceDispatcherHostTest : public testing::Test,
  public:
   ResourceDispatcherHostTest()
       : Receiver(ChildProcessInfo::RENDER_PROCESS, -1),
-        ui_thread_(ChromeThread::UI, &message_loop_),
-        io_thread_(ChromeThread::IO, &message_loop_),
+        ui_thread_(BrowserThread::UI, &message_loop_),
+        io_thread_(BrowserThread::IO, &message_loop_),
         old_factory_(NULL),
         resource_type_(ResourceType::SUB_RESOURCE) {
     set_handle(base::GetCurrentProcessHandle());
@@ -265,8 +265,8 @@ class ResourceDispatcherHostTest : public testing::Test,
   }
 
   MessageLoopForIO message_loop_;
-  ChromeThread ui_thread_;
-  ChromeThread io_thread_;
+  BrowserThread ui_thread_;
+  BrowserThread io_thread_;
   ResourceDispatcherHost host_;
   ResourceIPCAccumulator accum_;
   std::string response_headers_;
diff --git a/chrome/browser/renderer_host/resource_handler.h b/chrome/browser/renderer_host/resource_handler.h
index b6758ae..42c0d41 100644
--- a/chrome/browser/renderer_host/resource_handler.h
+++ b/chrome/browser/renderer_host/resource_handler.h
@@ -30,7 +30,7 @@ class URLRequestStatus;
 // See the implementations of this interface defined below.
 class ResourceHandler
     : public base::RefCountedThreadSafe<
-          ResourceHandler, ChromeThread::DeleteOnIOThread> {
+          ResourceHandler, BrowserThread::DeleteOnIOThread> {
  public:
   // Called as upload progress is made.
   virtual bool OnUploadProgress(int request_id,
diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc
index a03cfe1..3e97074 100644
--- a/chrome/browser/renderer_host/resource_message_filter.cc
+++ b/chrome/browser/renderer_host/resource_message_filter.cc
@@ -280,7 +280,7 @@ ResourceMessageFilter::ResourceMessageFilter(
 
 ResourceMessageFilter::~ResourceMessageFilter() {
   // This function should be called on the IO thread.
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // Tell the DOM Storage dispatcher host to stop sending messages via us.
   dom_storage_dispatcher_host_->Shutdown();
@@ -315,7 +315,7 @@ void ResourceMessageFilter::OnFilterAdded(IPC::Channel* channel) {
 // Called on the IPC thread:
 void ResourceMessageFilter::OnChannelConnected(int32 peer_pid) {
   DCHECK(!handle()) << " " << handle();
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   base::ProcessHandle peer_handle;
   if (!base::OpenProcessHandle(peer_pid, &peer_handle)) {
@@ -540,7 +540,7 @@ bool ResourceMessageFilter::OnMessageReceived(const IPC::Message& msg) {
 }
 
 void ResourceMessageFilter::OnDestruct() {
-  ChromeThread::DeleteOnIOThread::Destruct(this);
+  BrowserThread::DeleteOnIOThread::Destruct(this);
 }
 
 void ResourceMessageFilter::OnReceiveContextMenuMsg(const IPC::Message& msg) {
@@ -551,8 +551,8 @@ void ResourceMessageFilter::OnReceiveContextMenuMsg(const IPC::Message& msg) {
 
   // Create a new ViewHostMsg_ContextMenu message.
   const ViewHostMsg_ContextMenu context_menu_message(msg.routing_id(), params);
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       new ContextMenuMessageDispatcher(id(), context_menu_message));
 }
 
@@ -744,8 +744,8 @@ void ResourceMessageFilter::OnGetPlugins(bool refresh,
   }
 
   // Can't load plugins on IO thread, so go to the FILE thread.
-  ChromeThread::PostTask(
-      ChromeThread::FILE, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::OnGetPluginsOnFileThread, refresh,
           reply_msg));
@@ -753,12 +753,12 @@ void ResourceMessageFilter::OnGetPlugins(bool refresh,
 
 void ResourceMessageFilter::OnGetPluginsOnFileThread(
     bool refresh, IPC::Message* reply_msg) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   std::vector<WebPluginInfo> plugins;
   NPAPI::PluginList::Singleton()->GetEnabledPlugins(refresh, &plugins);
   ViewHostMsg_GetPlugins::WriteReplyParams(reply_msg, plugins);
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(this, &ResourceMessageFilter::Send, reply_msg));
 }
 
@@ -768,8 +768,8 @@ void ResourceMessageFilter::OnGetPluginInfo(const GURL& url,
                                             IPC::Message* reply_msg) {
   // The PluginList::GetPluginInfo may need to load the plugins.  Don't do it
   // on the IO thread.
-  ChromeThread::PostTask(
-      ChromeThread::FILE, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::OnGetPluginInfoOnFileThread,
           url, policy_url, mime_type, reply_msg));
@@ -785,8 +785,8 @@ void ResourceMessageFilter::OnGetPluginInfoOnFileThread(
   bool allow_wildcard = true;
   bool found = NPAPI::PluginList::Singleton()->GetPluginInfo(
       url, mime_type, allow_wildcard, &info, &actual_mime_type);
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::OnGotPluginInfo,
           found, info, actual_mime_type, policy_url, reply_msg));
@@ -909,8 +909,8 @@ void ResourceMessageFilter::OnClipboardWriteObjectsSync(
   Clipboard::ReplaceSharedMemHandle(long_living_objects, bitmap_handle,
                                     handle());
 
-  ChromeThread::PostTask(
-      ChromeThread::UI,
+  BrowserThread::PostTask(
+      BrowserThread::UI,
       FROM_HERE,
       new WriteClipboardTask(long_living_objects));
 }
@@ -926,8 +926,8 @@ void ResourceMessageFilter::OnClipboardWriteObjectsAsync(
   // be removed otherwise we might dereference a rubbish pointer.
   long_living_objects->erase(Clipboard::CBF_SMBITMAP);
 
-  ChromeThread::PostTask(
-      ChromeThread::UI,
+  BrowserThread::PostTask(
+      BrowserThread::UI,
       FROM_HERE,
       new WriteClipboardTask(long_living_objects));
 }
@@ -1089,8 +1089,8 @@ void ResourceMessageFilter::OnResourceTypeStats(
                    static_cast<int>(stats.fonts.size / 1024));
   // We need to notify the TaskManager of these statistics from the UI
   // thread.
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       NewRunnableFunction(
           &ResourceMessageFilter::OnResourceTypeStatsOnUIThread,
           stats,
@@ -1099,7 +1099,7 @@ void ResourceMessageFilter::OnResourceTypeStats(
 
 void ResourceMessageFilter::OnResourceTypeStatsOnUIThread(
     WebCache::ResourceTypeStats stats, base::ProcessId renderer_id) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   TaskManager::GetInstance()->model()->NotifyResourceTypeStats(
       renderer_id, stats);
 }
@@ -1107,8 +1107,8 @@ void ResourceMessageFilter::OnResourceTypeStatsOnUIThread(
 
 void ResourceMessageFilter::OnV8HeapStats(int v8_memory_allocated,
                                           int v8_memory_used) {
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       NewRunnableFunction(&ResourceMessageFilter::OnV8HeapStatsOnUIThread,
                           v8_memory_allocated,
                           v8_memory_used,
@@ -1118,7 +1118,7 @@ void ResourceMessageFilter::OnV8HeapStats(int v8_memory_allocated,
 // static
 void ResourceMessageFilter::OnV8HeapStatsOnUIThread(
     int v8_memory_allocated, int v8_memory_used, base::ProcessId renderer_id) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   TaskManager::GetInstance()->model()->NotifyV8HeapStats(
       renderer_id,
       static_cast<size_t>(v8_memory_allocated),
@@ -1141,7 +1141,7 @@ void ResourceMessageFilter::UpdateHostZoomLevelsOnUIThread(
     const GURL& url,
     int render_process_id,
     int render_view_id) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (remember) {
     host_zoom_map_->SetZoomLevel(url, zoom_level);
     // Notify renderers from this profile.
@@ -1285,7 +1285,7 @@ Clipboard* ResourceMessageFilter::GetClipboard() {
 
 ChromeURLRequestContext* ResourceMessageFilter::GetRequestContextForURL(
     const GURL& url) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   URLRequestContextGetter* context_getter =
       url.SchemeIs(chrome::kExtensionScheme) ?
           extensions_request_context_ : request_context_;
@@ -1355,8 +1355,8 @@ void ResourceMessageFilter::OnOpenChannelToExtension(
   int port2_id;
   ExtensionMessageService::AllocatePortIdPair(port_id, &port2_id);
 
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::OpenChannelToExtensionOnUIThread,
           id(), routing_id, port2_id, source_extension_id,
@@ -1369,7 +1369,7 @@ void ResourceMessageFilter::OpenChannelToExtensionOnUIThread(
     const std::string& source_extension_id,
     const std::string& target_extension_id,
     const std::string& channel_name) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   profile_->GetExtensionMessageService()->OpenChannelToExtension(
       source_process_id, source_routing_id, receiver_port_id,
       source_extension_id, target_extension_id, channel_name);
@@ -1381,8 +1381,8 @@ void ResourceMessageFilter::OnOpenChannelToTab(
   int port2_id;
   ExtensionMessageService::AllocatePortIdPair(port_id, &port2_id);
 
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::OpenChannelToTabOnUIThread,
           id(), routing_id, port2_id, tab_id, extension_id, channel_name));
@@ -1394,7 +1394,7 @@ void ResourceMessageFilter::OpenChannelToTabOnUIThread(
     int tab_id,
     const std::string& extension_id,
     const std::string& channel_name) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   profile_->GetExtensionMessageService()->OpenChannelToTab(
       source_process_id, source_routing_id, receiver_port_id,
       tab_id, extension_id, channel_name);
@@ -1507,8 +1507,8 @@ void ResourceMessageFilter::OnGetFileSize(const FilePath& path,
 
   // Getting file size could take long time if it lives on a network share,
   // so run it on FILE thread.
-  ChromeThread::PostTask(
-      ChromeThread::FILE, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::OnGetFileInfoOnFileThread, path,
           reply_msg, &WriteFileSize));
@@ -1527,8 +1527,8 @@ void ResourceMessageFilter::OnGetFileModificationTime(const FilePath& path,
 
   // Getting file modification time could take a long time if it lives on a
   // network share, so run it on the FILE thread.
-  ChromeThread::PostTask(
-      ChromeThread::FILE, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::OnGetFileInfoOnFileThread,
           path, reply_msg, &WriteFileModificationTime));
@@ -1538,7 +1538,7 @@ void ResourceMessageFilter::OnGetFileInfoOnFileThread(
     const FilePath& path,
     IPC::Message* reply_msg,
     FileInfoWriteFunc write_func) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   base::PlatformFileInfo file_info;
   file_info.size = 0;
@@ -1546,8 +1546,8 @@ void ResourceMessageFilter::OnGetFileInfoOnFileThread(
 
   (*write_func)(reply_msg, file_info);
 
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(this, &ResourceMessageFilter::Send, reply_msg));
 }
 
@@ -1572,8 +1572,8 @@ void ResourceMessageFilter::OnOpenFile(const FilePath& path,
 
   // Opening the file could take a long time if it lives on a network share,
   // so run it on the FILE thread.
-  ChromeThread::PostTask(
-      ChromeThread::FILE, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::OnOpenFileOnFileThread,
           path, mode, reply_msg));
@@ -1582,7 +1582,7 @@ void ResourceMessageFilter::OnOpenFile(const FilePath& path,
 void ResourceMessageFilter::OnOpenFileOnFileThread(const FilePath& path,
                                                    int mode,
                                                    IPC::Message* reply_msg) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   base::PlatformFile file_handle = base::CreatePlatformFile(
       path,
@@ -1613,8 +1613,8 @@ void ResourceMessageFilter::OnOpenFileOnFileThread(const FilePath& path,
 #endif
       );
 
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(this, &ResourceMessageFilter::Send, reply_msg));
 }
 
@@ -1670,16 +1670,16 @@ void ResourceMessageFilter::OnKeygenOnWorkerThread(
       reply_msg,
       keygen_handler.GenKeyAndSignChallenge());
 
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(this, &ResourceMessageFilter::Send, reply_msg));
 }
 
 #if defined(USE_TCMALLOC)
 void ResourceMessageFilter::OnRendererTcmalloc(base::ProcessId pid,
                                                const std::string& output) {
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       NewRunnableFunction(AboutTcmallocRendererCallback, pid, output));
 }
 #endif
@@ -1707,8 +1707,8 @@ void ResourceMessageFilter::OnGetExtensionMessageBundle(
   std::string default_locale =
       context->extension_info_map()->GetDefaultLocaleForExtension(extension_id);
 
-  ChromeThread::PostTask(
-      ChromeThread::FILE, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::OnGetExtensionMessageBundleOnFileThread,
           extension_path, extension_id, default_locale, reply_msg));
@@ -1719,7 +1719,7 @@ void ResourceMessageFilter::OnGetExtensionMessageBundleOnFileThread(
     const std::string& extension_id,
     const std::string& default_locale,
     IPC::Message* reply_msg) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   std::map<std::string, std::string> dictionary_map;
   if (!default_locale.empty()) {
@@ -1741,8 +1741,8 @@ void ResourceMessageFilter::OnGetExtensionMessageBundleOnFileThread(
   ViewHostMsg_GetExtensionMessageBundle::WriteReplyParams(
       reply_msg, dictionary_map);
 
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(this, &ResourceMessageFilter::Send, reply_msg));
 }
 
@@ -1750,7 +1750,7 @@ void ResourceMessageFilter::OnAsyncOpenFile(const IPC::Message& msg,
                                             const FilePath& path,
                                             int flags,
                                             int message_id) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (!ChildProcessSecurityPolicy::GetInstance()->HasPermissionsForFile(
           id(), path, flags)) {
@@ -1760,8 +1760,8 @@ void ResourceMessageFilter::OnAsyncOpenFile(const IPC::Message& msg,
     return;
   }
 
-  ChromeThread::PostTask(
-      ChromeThread::FILE, FROM_HERE, NewRunnableMethod(
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE, NewRunnableMethod(
           this, &ResourceMessageFilter::AsyncOpenFileOnFileThread,
           path, flags, message_id, msg.routing_id()));
 }
@@ -1770,7 +1770,7 @@ void ResourceMessageFilter::AsyncOpenFileOnFileThread(const FilePath& path,
                                                       int flags,
                                                       int message_id,
                                                       int routing_id) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   base::PlatformFileError error_code = base::PLATFORM_FILE_OK;
   base::PlatformFile file = base::CreatePlatformFile(
       path, flags, NULL, &error_code);
@@ -1787,8 +1787,8 @@ void ResourceMessageFilter::AsyncOpenFileOnFileThread(const FilePath& path,
 
   IPC::Message* reply = new ViewMsg_AsyncOpenFile_ACK(
       routing_id, error_code, file_for_transit, message_id);
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE, NewRunnableMethod(
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE, NewRunnableMethod(
           this, &ResourceMessageFilter::Send, reply));
 }
 
diff --git a/chrome/browser/renderer_host/resource_message_filter_gtk.cc b/chrome/browser/renderer_host/resource_message_filter_gtk.cc
index 5562e46..57f68db 100644
--- a/chrome/browser/renderer_host/resource_message_filter_gtk.cc
+++ b/chrome/browser/renderer_host/resource_message_filter_gtk.cc
@@ -55,8 +55,8 @@ void ResourceMessageFilter::DoOnGetScreenInfo(gfx::NativeViewId view,
   WebScreenInfo results = WebScreenInfoFactory::screenInfo(display, screen);
   ViewHostMsg_GetScreenInfo::WriteReplyParams(reply_msg, results);
 
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::SendDelayedReply, reply_msg));
 }
@@ -81,8 +81,8 @@ void ResourceMessageFilter::DoOnGetWindowRect(gfx::NativeViewId view,
 
   ViewHostMsg_GetWindowRect::WriteReplyParams(reply_msg, rect);
 
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::SendDelayedReply, reply_msg));
 }
@@ -124,8 +124,8 @@ void ResourceMessageFilter::DoOnGetRootWindowRect(gfx::NativeViewId view,
 
   ViewHostMsg_GetRootWindowRect::WriteReplyParams(reply_msg, rect);
 
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::SendDelayedReply, reply_msg));
 }
@@ -138,8 +138,8 @@ void ResourceMessageFilter::DoOnClipboardIsFormatAvailable(
 
   ViewHostMsg_ClipboardIsFormatAvailable::WriteReplyParams(reply_msg, result);
 
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::SendDelayedReply, reply_msg));
 }
@@ -152,8 +152,8 @@ void ResourceMessageFilter::DoOnClipboardReadText(Clipboard::Buffer buffer,
 
   ViewHostMsg_ClipboardReadText::WriteReplyParams(reply_msg, result);
 
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::SendDelayedReply, reply_msg));
 }
@@ -166,8 +166,8 @@ void ResourceMessageFilter::DoOnClipboardReadAsciiText(
 
   ViewHostMsg_ClipboardReadAsciiText::WriteReplyParams(reply_msg, result);
 
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::SendDelayedReply, reply_msg));
 }
@@ -182,8 +182,8 @@ void ResourceMessageFilter::DoOnClipboardReadHTML(Clipboard::Buffer buffer,
 
   ViewHostMsg_ClipboardReadHTML::WriteReplyParams(reply_msg, markup, src_url);
 
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::SendDelayedReply, reply_msg));
 }
@@ -191,8 +191,8 @@ void ResourceMessageFilter::DoOnClipboardReadHTML(Clipboard::Buffer buffer,
 // Called on the UI thread.
 void ResourceMessageFilter::DoOnClipboardReadAvailableTypes(
     Clipboard::Buffer buffer, IPC::Message* reply_msg) {
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::SendDelayedReply, reply_msg));
 }
@@ -201,16 +201,16 @@ void ResourceMessageFilter::DoOnClipboardReadAvailableTypes(
 void ResourceMessageFilter::DoOnClipboardReadData(Clipboard::Buffer buffer,
                                                   const string16& type,
                                                   IPC::Message* reply_msg) {
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::SendDelayedReply, reply_msg));
 }
 // Called on the UI thread.
 void ResourceMessageFilter::DoOnClipboardReadFilenames(
     Clipboard::Buffer buffer, IPC::Message* reply_msg) {
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::SendDelayedReply, reply_msg));
 }
@@ -249,8 +249,8 @@ void ResourceMessageFilter::DoOnAllocateTempFileForPrinting(
   ViewHostMsg_AllocateTempFileForPrinting::WriteReplyParams(
       reply_msg, temp_file_fd, fd_in_browser);
 
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::SendDelayedReply, reply_msg));
 }
@@ -258,8 +258,8 @@ void ResourceMessageFilter::DoOnAllocateTempFileForPrinting(
 // Called on the IO thread.
 void ResourceMessageFilter::OnGetScreenInfo(gfx::NativeViewId view,
                                             IPC::Message* reply_msg) {
-   ChromeThread::PostTask(
-      ChromeThread::BACKGROUND_X11, FROM_HERE,
+   BrowserThread::PostTask(
+      BrowserThread::BACKGROUND_X11, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::DoOnGetScreenInfo, view, reply_msg));
 }
@@ -267,8 +267,8 @@ void ResourceMessageFilter::OnGetScreenInfo(gfx::NativeViewId view,
 // Called on the IO thread.
 void ResourceMessageFilter::OnGetWindowRect(gfx::NativeViewId view,
                                             IPC::Message* reply_msg) {
-  ChromeThread::PostTask(
-      ChromeThread::BACKGROUND_X11, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::BACKGROUND_X11, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::DoOnGetWindowRect, view, reply_msg));
 }
@@ -276,8 +276,8 @@ void ResourceMessageFilter::OnGetWindowRect(gfx::NativeViewId view,
 // Called on the IO thread.
 void ResourceMessageFilter::OnGetRootWindowRect(gfx::NativeViewId view,
                                                 IPC::Message* reply_msg) {
-  ChromeThread::PostTask(
-      ChromeThread::BACKGROUND_X11, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::BACKGROUND_X11, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::DoOnGetRootWindowRect, view,
           reply_msg));
@@ -287,8 +287,8 @@ void ResourceMessageFilter::OnGetRootWindowRect(gfx::NativeViewId view,
 void ResourceMessageFilter::OnClipboardIsFormatAvailable(
     Clipboard::FormatType format, Clipboard::Buffer buffer,
     IPC::Message* reply_msg) {
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::DoOnClipboardIsFormatAvailable, format,
           buffer, reply_msg));
@@ -297,8 +297,8 @@ void ResourceMessageFilter::OnClipboardIsFormatAvailable(
 // Called on the IO thread.
 void ResourceMessageFilter::OnClipboardReadText(Clipboard::Buffer buffer,
                                                 IPC::Message* reply_msg) {
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::DoOnClipboardReadText, buffer,
           reply_msg));
@@ -307,8 +307,8 @@ void ResourceMessageFilter::OnClipboardReadText(Clipboard::Buffer buffer,
 // Called on the IO thread.
 void ResourceMessageFilter::OnClipboardReadAsciiText(Clipboard::Buffer buffer,
                                                      IPC::Message* reply_msg) {
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::DoOnClipboardReadAsciiText, buffer,
           reply_msg));
@@ -317,8 +317,8 @@ void ResourceMessageFilter::OnClipboardReadAsciiText(Clipboard::Buffer buffer,
 // Called on the IO thread.
 void ResourceMessageFilter::OnClipboardReadHTML(Clipboard::Buffer buffer,
                                                 IPC::Message* reply_msg) {
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::DoOnClipboardReadHTML, buffer,
           reply_msg));
@@ -327,8 +327,8 @@ void ResourceMessageFilter::OnClipboardReadHTML(Clipboard::Buffer buffer,
 // Called on the IO thread.
 void ResourceMessageFilter::OnClipboardReadAvailableTypes(
     Clipboard::Buffer buffer, IPC::Message* reply_msg) {
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::DoOnClipboardReadAvailableTypes, buffer,
           reply_msg));
@@ -337,8 +337,8 @@ void ResourceMessageFilter::OnClipboardReadAvailableTypes(
 // Called on the IO thread.
 void ResourceMessageFilter::OnClipboardReadData(
     Clipboard::Buffer buffer, const string16& type, IPC::Message* reply_msg) {
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::DoOnClipboardReadData, buffer, type,
           reply_msg));
@@ -347,8 +347,8 @@ void ResourceMessageFilter::OnClipboardReadData(
 // Called on the IO thread.
 void ResourceMessageFilter::OnClipboardReadFilenames(
     Clipboard::Buffer buffer, IPC::Message* reply_msg) {
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::DoOnClipboardReadFilenames, buffer,
           reply_msg));
@@ -357,8 +357,8 @@ void ResourceMessageFilter::OnClipboardReadFilenames(
 // Called on the IO thread.
 void ResourceMessageFilter::OnAllocateTempFileForPrinting(
     IPC::Message* reply_msg) {
-   ChromeThread::PostTask(
-      ChromeThread::FILE, FROM_HERE,
+   BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::DoOnAllocateTempFileForPrinting,
           reply_msg));
diff --git a/chrome/browser/renderer_host/resource_message_filter_mac.mm b/chrome/browser/renderer_host/resource_message_filter_mac.mm
index ef83622..6868853 100644
--- a/chrome/browser/renderer_host/resource_message_filter_mac.mm
+++ b/chrome/browser/renderer_host/resource_message_filter_mac.mm
@@ -36,8 +36,8 @@ void ResourceMessageFilter::OnClipboardFindPboardWriteString(
     NSString* nsText = base::SysUTF16ToNSString(text);
     if (nsText) {
       // FindPasteboard must be used on the UI thread.
-      ChromeThread::PostTask(
-          ChromeThread::UI, FROM_HERE, new WriteFindPboardTask(nsText));
+      BrowserThread::PostTask(
+          BrowserThread::UI, FROM_HERE, new WriteFindPboardTask(nsText));
     }
   }
 }
diff --git a/chrome/browser/renderer_host/resource_queue.cc b/chrome/browser/renderer_host/resource_queue.cc
index 73e96a2..99d4800 100644
--- a/chrome/browser/renderer_host/resource_queue.cc
+++ b/chrome/browser/renderer_host/resource_queue.cc
@@ -13,7 +13,7 @@ ResourceQueueDelegate::~ResourceQueueDelegate() {
 }
 
 ResourceQueue::ResourceQueue() : shutdown_(false) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 ResourceQueue::~ResourceQueue() {
@@ -21,13 +21,13 @@ ResourceQueue::~ResourceQueue() {
 }
 
 void ResourceQueue::Initialize(const DelegateSet& delegates) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(delegates_.empty());
   delegates_ = delegates;
 }
 
 void ResourceQueue::Shutdown() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   shutdown_ = true;
   for (DelegateSet::iterator i = delegates_.begin();
@@ -39,7 +39,7 @@ void ResourceQueue::Shutdown() {
 void ResourceQueue::AddRequest(
     URLRequest* request,
     const ResourceDispatcherHostRequestInfo& request_info) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(!shutdown_);
 
   GlobalRequestID request_id(request_info.child_id(),
@@ -68,13 +68,13 @@ void ResourceQueue::AddRequest(
 }
 
 void ResourceQueue::RemoveRequest(const GlobalRequestID& request_id) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   requests_.erase(request_id);
 }
 
 void ResourceQueue::StartDelayedRequest(ResourceQueueDelegate* delegate,
                                         const GlobalRequestID& request_id) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(!shutdown_);
 
   DCHECK(ContainsKey(interested_delegates_, request_id));
diff --git a/chrome/browser/renderer_host/resource_queue_unittest.cc b/chrome/browser/renderer_host/resource_queue_unittest.cc
index 1f002d5..15fb09d 100644
--- a/chrome/browser/renderer_host/resource_queue_unittest.cc
+++ b/chrome/browser/renderer_host/resource_queue_unittest.cc
@@ -156,8 +156,8 @@ class ResourceQueueTest : public testing::Test, public URLRequest::Delegate {
   ResourceQueueTest()
       : response_started_count_(0),
         message_loop_(MessageLoop::TYPE_IO),
-        ui_thread_(ChromeThread::UI, &message_loop_),
-        io_thread_(ChromeThread::IO, &message_loop_) {
+        ui_thread_(BrowserThread::UI, &message_loop_),
+        io_thread_(BrowserThread::IO, &message_loop_) {
   }
 
   virtual void OnResponseStarted(URLRequest* request) {
@@ -175,8 +175,8 @@ class ResourceQueueTest : public testing::Test, public URLRequest::Delegate {
 
  private:
   MessageLoop message_loop_;
-  ChromeThread ui_thread_;
-  ChromeThread io_thread_;
+  BrowserThread ui_thread_;
+  BrowserThread io_thread_;
 };
 
 TEST_F(ResourceQueueTest, Basic) {
diff --git a/chrome/browser/renderer_host/save_file_resource_handler.cc b/chrome/browser/renderer_host/save_file_resource_handler.cc
index 17100bf..436917d 100644
--- a/chrome/browser/renderer_host/save_file_resource_handler.cc
+++ b/chrome/browser/renderer_host/save_file_resource_handler.cc
@@ -52,8 +52,8 @@ bool SaveFileResourceHandler::OnResponseStarted(int request_id,
   info->request_id = request_id;
   info->content_disposition = content_disposition_;
   info->save_source = SaveFileCreateInfo::SAVE_FILE_FROM_NET;
-  ChromeThread::PostTask(
-      ChromeThread::FILE, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(save_manager_,
                         &SaveFileManager::StartSave,
                         info));
@@ -82,8 +82,8 @@ bool SaveFileResourceHandler::OnReadCompleted(int request_id, int* bytes_read) {
   // We are passing ownership of this buffer to the save file manager.
   scoped_refptr<net::IOBuffer> buffer = NULL;
   read_buffer_.swap(buffer);
-  ChromeThread::PostTask(
-      ChromeThread::FILE, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(save_manager_,
                         &SaveFileManager::UpdateSaveProgress,
                         save_id_,
@@ -96,8 +96,8 @@ bool SaveFileResourceHandler::OnResponseCompleted(
     int request_id,
     const URLRequestStatus& status,
     const std::string& security_info) {
-  ChromeThread::PostTask(
-      ChromeThread::FILE, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(save_manager_,
                         &SaveFileManager::SaveFinished,
                         save_id_,
diff --git a/chrome/browser/ssl/ssl_add_cert_handler.cc b/chrome/browser/ssl/ssl_add_cert_handler.cc
index b6430a7..8cb4a8e 100644
--- a/chrome/browser/ssl/ssl_add_cert_handler.cc
+++ b/chrome/browser/ssl/ssl_add_cert_handler.cc
@@ -27,8 +27,8 @@ SSLAddCertHandler::SSLAddCertHandler(URLRequest* request,
   // Stay alive until the process completes and Finished() is called.
   AddRef();
   // Delay adding the certificate until the next mainloop iteration.
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(this, &SSLAddCertHandler::Run));
 }
 
diff --git a/chrome/browser/ssl/ssl_client_auth_handler.cc b/chrome/browser/ssl/ssl_client_auth_handler.cc
index 74b25bf..7d5c6a5 100644
--- a/chrome/browser/ssl/ssl_client_auth_handler.cc
+++ b/chrome/browser/ssl/ssl_client_auth_handler.cc
@@ -27,7 +27,7 @@ void SSLClientAuthHandler::OnRequestCancelled() {
 }
 
 void SSLClientAuthHandler::SelectCertificate() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   int render_process_host_id;
   int render_view_host_id;
@@ -48,14 +48,14 @@ void SSLClientAuthHandler::SelectCertificate() {
 
 // Notify the IO thread that we have selected a cert.
 void SSLClientAuthHandler::CertificateSelected(net::X509Certificate* cert) {
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           this, &SSLClientAuthHandler::DoCertificateSelected, cert));
 }
 
 void SSLClientAuthHandler::DoCertificateSelected(net::X509Certificate* cert) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   // request_ could have been NULLed if the request was cancelled while the
   // user was choosing a cert, or because we have already responded to the
   // certificate.
diff --git a/chrome/browser/ssl/ssl_client_auth_handler.h b/chrome/browser/ssl/ssl_client_auth_handler.h
index de90e5a..852467e 100644
--- a/chrome/browser/ssl/ssl_client_auth_handler.h
+++ b/chrome/browser/ssl/ssl_client_auth_handler.h
@@ -22,7 +22,7 @@ class URLRequest;
 // when the URLRequest is cancelled.
 class SSLClientAuthHandler
     : public base::RefCountedThreadSafe<SSLClientAuthHandler,
-                                        ChromeThread::DeleteOnIOThread> {
+                                        BrowserThread::DeleteOnIOThread> {
  public:
   SSLClientAuthHandler(URLRequest* request,
                        net::SSLCertRequestInfo* cert_request_info);
diff --git a/chrome/browser/ssl/ssl_error_handler.cc b/chrome/browser/ssl/ssl_error_handler.cc
index e77ab15..52792eb 100644
--- a/chrome/browser/ssl/ssl_error_handler.cc
+++ b/chrome/browser/ssl/ssl_error_handler.cc
@@ -26,7 +26,7 @@ SSLErrorHandler::SSLErrorHandler(ResourceDispatcherHost* rdh,
       frame_origin_(frame_origin),
       main_frame_origin_(main_frame_origin),
       request_has_been_notified_(false) {
-  DCHECK(!ChromeThread::CurrentlyOn(ChromeThread::UI));
+  DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   ResourceDispatcherHostRequestInfo* info =
       ResourceDispatcherHost::InfoForRequest(request);
@@ -47,7 +47,7 @@ SSLErrorHandler::SSLErrorHandler(ResourceDispatcherHost* rdh,
 }
 
 void SSLErrorHandler::Dispatch() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   TabContents* tab_contents = GetTabContents();
   if (!tab_contents) {
@@ -68,46 +68,46 @@ TabContents* SSLErrorHandler::GetTabContents() {
 }
 
 void SSLErrorHandler::CancelRequest() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // We need to complete this task on the IO thread.
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           this, &SSLErrorHandler::CompleteCancelRequest, net::ERR_ABORTED));
 }
 
 void SSLErrorHandler::DenyRequest() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // We need to complete this task on the IO thread.
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           this, &SSLErrorHandler::CompleteCancelRequest,
           net::ERR_INSECURE_RESPONSE));
 }
 
 void SSLErrorHandler::ContinueRequest() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // We need to complete this task on the IO thread.
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(this, &SSLErrorHandler::CompleteContinueRequest));
 }
 
 void SSLErrorHandler::TakeNoAction() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // We need to complete this task on the IO thread.
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(this, &SSLErrorHandler::CompleteTakeNoAction));
 }
 
 void SSLErrorHandler::CompleteCancelRequest(int error) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // It is important that we notify the URLRequest only once.  If we try to
   // notify the request twice, it may no longer exist and |this| might have
@@ -134,7 +134,7 @@ void SSLErrorHandler::CompleteCancelRequest(int error) {
 }
 
 void SSLErrorHandler::CompleteContinueRequest() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // It is important that we notify the URLRequest only once.  If we try to
   // notify the request twice, it may no longer exist and |this| might have
@@ -157,7 +157,7 @@ void SSLErrorHandler::CompleteContinueRequest() {
 }
 
 void SSLErrorHandler::CompleteTakeNoAction() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // It is important that we notify the URLRequest only once.  If we try to
   // notify the request twice, it may no longer exist and |this| might have
diff --git a/chrome/browser/ssl/ssl_manager.cc b/chrome/browser/ssl/ssl_manager.cc
index a2a34ab..ee2dd31 100644
--- a/chrome/browser/ssl/ssl_manager.cc
+++ b/chrome/browser/ssl/ssl_manager.cc
@@ -36,8 +36,8 @@ void SSLManager::OnSSLCertificateError(ResourceDispatcherHost* rdh,
 
   // A certificate error occurred.  Construct a SSLCertErrorHandler object and
   // hand it over to the UI thread for processing.
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(new SSLCertErrorHandler(rdh,
                                                 request,
                                                 info->resource_type(),