Move BrowserThread to content namespace.

TBR=owners BUG=98716 Review URL: http://codereview.chromium.org/8437002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108270 0039d316-1c4b-4281-b951-d872f2087c98
author: joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2011-11-02 11:29:39 +0000
committer: joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2011-11-02 11:29:39 +0000
commit: 631bb742a2798549af691af7357236ce0899b4cb (patch)
tree: 1852356dc787a9c65e892ea1a57dfc03595d2bb4 /content/browser
parent: e301da283ab61ff78a108d5ed3246d8b09614ef2 (diff)
download: chromium_src-631bb742a2798549af691af7357236ce0899b4cb.zip
chromium_src-631bb742a2798549af691af7357236ce0899b4cb.tar.gz
chromium_src-631bb742a2798549af691af7357236ce0899b4cb.tar.bz2
148 files changed, 266 insertions, 63 deletions
diff --git a/content/browser/appcache/chrome_appcache_service.cc b/content/browser/appcache/chrome_appcache_service.cc
index 08336ada..82d1f42 100644
--- a/content/browser/appcache/chrome_appcache_service.cc
+++ b/content/browser/appcache/chrome_appcache_service.cc
@@ -12,6 +12,8 @@
 #include "net/base/net_errors.h"
 #include "webkit/quota/quota_manager.h"
 
+using content::BrowserThread;
+
 ChromeAppCacheService::ChromeAppCacheService(
     quota::QuotaManagerProxy* quota_manager_proxy)
     : AppCacheService(quota_manager_proxy),
diff --git a/content/browser/appcache/chrome_appcache_service.h b/content/browser/appcache/chrome_appcache_service.h
index c941297..3717dc1 100644
--- a/content/browser/appcache/chrome_appcache_service.h
+++ b/content/browser/appcache/chrome_appcache_service.h
@@ -34,8 +34,8 @@ class ResourceContext;
 // TODO(dpranke): Fix dependencies on AppCacheService so that we don't have
 // to worry about clients calling AppCacheService methods.
 class CONTENT_EXPORT ChromeAppCacheService
-    : public base::RefCountedThreadSafe<ChromeAppCacheService,
-                                        BrowserThread::DeleteOnIOThread>,
+    : public base::RefCountedThreadSafe<
+          ChromeAppCacheService, content::BrowserThread::DeleteOnIOThread>,
       NON_EXPORTED_BASE(public appcache::AppCacheService),
       NON_EXPORTED_BASE(public appcache::AppCachePolicy),
       public content::NotificationObserver {
@@ -48,9 +48,10 @@ class CONTENT_EXPORT ChromeAppCacheService
       scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy);
 
  private:
-  friend class base::RefCountedThreadSafe<ChromeAppCacheService,
-                                          BrowserThread::DeleteOnIOThread>;
-  friend class BrowserThread;
+  friend class base::RefCountedThreadSafe<
+      ChromeAppCacheService,
+      content::BrowserThread::DeleteOnIOThread>;
+  friend class content::BrowserThread;
   friend class DeleteTask<ChromeAppCacheService>;
 
   virtual ~ChromeAppCacheService();
diff --git a/content/browser/appcache/chrome_appcache_service_unittest.cc b/content/browser/appcache/chrome_appcache_service_unittest.cc
index bb1cb9b..174d613 100644
--- a/content/browser/appcache/chrome_appcache_service_unittest.cc
+++ b/content/browser/appcache/chrome_appcache_service_unittest.cc
@@ -16,6 +16,7 @@
 
 #include <set>
 
+using content::BrowserThread;
 using content::BrowserThreadImpl;
 
 namespace {
diff --git a/content/browser/browser_child_process_host.cc b/content/browser/browser_child_process_host.cc
index 532b2cd..ef65dbf 100644
--- a/content/browser/browser_child_process_host.cc
+++ b/content/browser/browser_child_process_host.cc
@@ -28,6 +28,8 @@
 #include "base/synchronization/waitable_event.h"
 #endif  // OS_WIN
 
+using content::BrowserThread;
+
 namespace {
 
 typedef std::list<BrowserChildProcessHost*> ChildProcessList;
diff --git a/content/browser/browser_message_filter.cc b/content/browser/browser_message_filter.cc
index e8fe86c..9535ae6 100644
--- a/content/browser/browser_message_filter.cc
+++ b/content/browser/browser_message_filter.cc
@@ -11,6 +11,8 @@
 #include "content/public/common/result_codes.h"
 #include "ipc/ipc_sync_message.h"
 
+using content::BrowserThread;
+
 BrowserMessageFilter::BrowserMessageFilter()
     : channel_(NULL), peer_handle_(base::kNullProcessHandle) {
 }
diff --git a/content/browser/browser_message_filter.h b/content/browser/browser_message_filter.h
index 69223f0..8230916 100644
--- a/content/browser/browser_message_filter.h
+++ b/content/browser/browser_message_filter.h
@@ -38,7 +38,7 @@ class CONTENT_EXPORT BrowserMessageFilter :
   // If you don't handle this message, or want to keep it on the IO thread, do
   // nothing.
   virtual void OverrideThreadForMessage(const IPC::Message& message,
-                                        BrowserThread::ID* thread);
+                                        content::BrowserThread::ID* thread);
 
   // Override this to receive messages.
   // Your function will normally be called on the IO thread.  However, if your
diff --git a/content/browser/browser_thread_impl.cc b/content/browser/browser_thread_impl.cc
index fcccb0c..ef5be1b 100644
--- a/content/browser/browser_thread_impl.cc
+++ b/content/browser/browser_thread_impl.cc
@@ -12,7 +12,7 @@
 namespace {
 
 // Friendly names for the well-known threads.
-static const char* browser_thread_names[BrowserThread::ID_COUNT] = {
+static const char* browser_thread_names[content::BrowserThread::ID_COUNT] = {
   "",  // UI (name assembled in browser_main.cc).
   "Chrome_DBThread",  // DB
   "Chrome_WebKitThread",  // WEBKIT
@@ -130,10 +130,6 @@ bool BrowserThreadImpl::PostTaskHelper(
   return !!message_loop;
 }
 
-}  // namespace content
-
-using content::BrowserThreadImpl;
-
 // TODO(joi): Remove
 DeprecatedBrowserThread::DeprecatedBrowserThread(BrowserThread::ID identifier)
     : BrowserThread(identifier) {
@@ -387,3 +383,5 @@ BrowserThread::GetMessageLoopProxyForThread(
       new BrowserThreadMessageLoopProxy(identifier));
   return proxy;
 }
+
+}  // namespace content
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc
index e487c0d..b8822f9 100644
--- a/content/browser/child_process_launcher.cc
+++ b/content/browser/child_process_launcher.cc
@@ -34,6 +34,8 @@
 #include "base/global_descriptors_posix.h"
 #endif
 
+using content::BrowserThread;
+
 // Having the functionality of ChildProcessLauncher be in an internal
 // ref counted object allows us to automatically terminate the process when the
 // parent class destructs, while still holding on to state that we need.
diff --git a/content/browser/chrome_blob_storage_context.cc b/content/browser/chrome_blob_storage_context.cc
index 8149191..85a706c 100644
--- a/content/browser/chrome_blob_storage_context.cc
+++ b/content/browser/chrome_blob_storage_context.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,6 +6,7 @@
 
 #include "webkit/blob/blob_storage_controller.h"
 
+using content::BrowserThread;
 using webkit_blob::BlobStorageController;
 
 ChromeBlobStorageContext::ChromeBlobStorageContext() {
diff --git a/content/browser/chrome_blob_storage_context.h b/content/browser/chrome_blob_storage_context.h
index 8375833..02fa3d1 100644
--- a/content/browser/chrome_blob_storage_context.h
+++ b/content/browser/chrome_blob_storage_context.h
@@ -25,8 +25,8 @@ class BlobStorageController;
 // All methods, except the ctor, are expected to be called on
 // the IO thread (unless specifically called out in doc comments).
 class CONTENT_EXPORT ChromeBlobStorageContext
-    : public base::RefCountedThreadSafe<ChromeBlobStorageContext,
-                                        BrowserThread::DeleteOnIOThread> {
+    : public base::RefCountedThreadSafe<
+          ChromeBlobStorageContext, content::BrowserThread::DeleteOnIOThread> {
  public:
   ChromeBlobStorageContext();
 
@@ -37,9 +37,9 @@ class CONTENT_EXPORT ChromeBlobStorageContext
   }
 
  private:
-  friend class base::RefCountedThreadSafe<ChromeBlobStorageContext,
-                                          BrowserThread::DeleteOnIOThread>;
-  friend class BrowserThread;
+  friend class base::RefCountedThreadSafe<
+      ChromeBlobStorageContext, content::BrowserThread::DeleteOnIOThread>;
+  friend class content::BrowserThread;
   friend class DeleteTask<ChromeBlobStorageContext>;
 
   virtual ~ChromeBlobStorageContext();
diff --git a/content/browser/debugger/devtools_http_protocol_handler.cc b/content/browser/debugger/devtools_http_protocol_handler.cc
index 9117ee6..c16659c 100644
--- a/content/browser/debugger/devtools_http_protocol_handler.cc
+++ b/content/browser/debugger/devtools_http_protocol_handler.cc
@@ -27,6 +27,8 @@
 #include "net/server/http_server_request_info.h"
 #include "net/url_request/url_request_context.h"
 
+using content::BrowserThread;
+
 const int kBufferSize = 16 * 1024;
 
 namespace {
diff --git a/content/browser/debugger/devtools_manager.cc b/content/browser/debugger/devtools_manager.cc
index aaddf98..95bf06d 100644
--- a/content/browser/debugger/devtools_manager.cc
+++ b/content/browser/debugger/devtools_manager.cc
@@ -18,6 +18,8 @@
 #include "content/public/browser/content_browser_client.h"
 #include "googleurl/src/gurl.h"
 
+using content::BrowserThread;
+
 // static
 DevToolsManager* DevToolsManager::GetInstance() {
   return content::GetContentClient()->browser()->GetDevToolsManager();
diff --git a/content/browser/debugger/devtools_netlog_observer.cc b/content/browser/debugger/devtools_netlog_observer.cc
index 53d1fbd4..023ced3 100644
--- a/content/browser/debugger/devtools_netlog_observer.cc
+++ b/content/browser/debugger/devtools_netlog_observer.cc
@@ -18,6 +18,8 @@
 #include "net/url_request/url_request_netlog_params.h"
 #include "webkit/glue/resource_loader_bridge.h"
 
+using content::BrowserThread;
+
 const size_t kMaxNumEntries = 1000;
 
 DevToolsNetLogObserver* DevToolsNetLogObserver::instance_ = NULL;
diff --git a/content/browser/debugger/worker_devtools_manager.cc b/content/browser/debugger/worker_devtools_manager.cc
index 4ec08ce..beb6a89 100644
--- a/content/browser/debugger/worker_devtools_manager.cc
+++ b/content/browser/debugger/worker_devtools_manager.cc
@@ -20,6 +20,8 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 
+using content::BrowserThread;
+
 class WorkerDevToolsManager::AgentHosts
     : private content::NotificationObserver {
 public:
diff --git a/content/browser/device_orientation/message_filter.cc b/content/browser/device_orientation/message_filter.cc
index 46e0647b..125a718 100644
--- a/content/browser/device_orientation/message_filter.cc
+++ b/content/browser/device_orientation/message_filter.cc
@@ -12,6 +12,8 @@
 #include "content/common/device_orientation_messages.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace device_orientation {
 
 MessageFilter::MessageFilter() : provider_(NULL) {
diff --git a/content/browser/device_orientation/provider.cc b/content/browser/device_orientation/provider.cc
index c1cd32f..1287b0e 100644
--- a/content/browser/device_orientation/provider.cc
+++ b/content/browser/device_orientation/provider.cc
@@ -13,6 +13,8 @@
 #include "content/browser/device_orientation/accelerometer_mac.h"
 #endif
 
+using content::BrowserThread;
+
 namespace device_orientation {
 
 Provider* Provider::GetInstance() {
diff --git a/content/browser/download/base_file.cc b/content/browser/download/base_file.cc
index 25c2434..9b661e2 100644
--- a/content/browser/download/base_file.cc
+++ b/content/browser/download/base_file.cc
@@ -26,6 +26,8 @@
 #include "content/browser/file_metadata_mac.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 #define LOG_ERROR(o, e)  LogError(__FILE__, __LINE__, __FUNCTION__, o, e)
diff --git a/content/browser/download/base_file_unittest.cc b/content/browser/download/base_file_unittest.cc
index e14b618..df80e24 100644
--- a/content/browser/download/base_file_unittest.cc
+++ b/content/browser/download/base_file_unittest.cc
@@ -16,6 +16,7 @@
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using content::BrowserThreadImpl;
 
 namespace {
diff --git a/content/browser/download/download_file.cc b/content/browser/download/download_file.cc
index a1980f4..3e29fd8 100644
--- a/content/browser/download/download_file.cc
+++ b/content/browser/download/download_file.cc
@@ -12,6 +12,8 @@
 #include "content/browser/download/download_manager.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace {
 
   // The maximum number of 'uniquified' files we will try to create.
diff --git a/content/browser/download/download_file_manager.cc b/content/browser/download/download_file_manager.cc
index 5c2774b..d131d47 100644
--- a/content/browser/download/download_file_manager.cc
+++ b/content/browser/download/download_file_manager.cc
@@ -24,6 +24,8 @@
 #include "googleurl/src/gurl.h"
 #include "net/base/io_buffer.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Throttle updates to the UI thread so that a fast moving download doesn't
diff --git a/content/browser/download/download_file_unittest.cc b/content/browser/download/download_file_unittest.cc
index 42288e0..0091125 100644
--- a/content/browser/download/download_file_unittest.cc
+++ b/content/browser/download/download_file_unittest.cc
@@ -19,6 +19,7 @@
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using content::BrowserThreadImpl;
 
 DownloadId::Domain kValidIdDomain = "valid DownloadId::Domain";
diff --git a/content/browser/download/download_id_unittest.cc b/content/browser/download/download_id_unittest.cc
index 10ab808..17d944b 100644
--- a/content/browser/download/download_id_unittest.cc
+++ b/content/browser/download/download_id_unittest.cc
@@ -14,6 +14,7 @@
 #include "content/browser/download/mock_download_manager_delegate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using content::BrowserThreadImpl;
 
 class DownloadIdTest : public testing::Test {
diff --git a/content/browser/download/download_item.cc b/content/browser/download/download_item.cc
index 29c2e87..b8dfbd1 100644
--- a/content/browser/download/download_item.cc
+++ b/content/browser/download/download_item.cc
@@ -31,6 +31,8 @@
 #include "content/public/browser/download_manager_delegate.h"
 #include "net/base/net_util.h"
 
+using content::BrowserThread;
+
 // A DownloadItem normally goes through the following states:
 //      * Created (when download starts)
 //      * Made visible to consumers (e.g. Javascript) after the
diff --git a/content/browser/download/download_manager.cc b/content/browser/download/download_manager.cc
index 05d3300..636d97b 100644
--- a/content/browser/download/download_manager.cc
+++ b/content/browser/download/download_manager.cc
@@ -35,6 +35,8 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Param structs exist because base::Bind can only handle 6 args.
diff --git a/content/browser/download/download_manager.h b/content/browser/download/download_manager.h
index 44157e6..cf8d2db 100644
--- a/content/browser/download/download_manager.h
+++ b/content/browser/download/download_manager.h
@@ -69,8 +69,8 @@ class DownloadManagerDelegate;
 
 // Browser's download manager: manages all downloads and destination view.
 class CONTENT_EXPORT DownloadManager
-    : public base::RefCountedThreadSafe<DownloadManager,
-                                        BrowserThread::DeleteOnUIThread>,
+    : public base::RefCountedThreadSafe<
+          DownloadManager, content::BrowserThread::DeleteOnUIThread>,
       public DownloadStatusUpdaterDelegate {
  public:
   DownloadManager(content::DownloadManagerDelegate* delegate,
@@ -295,9 +295,10 @@ class CONTENT_EXPORT DownloadManager
   friend class DownloadTest;
   friend class MockDownloadManager;
 
-  friend class base::RefCountedThreadSafe<DownloadManager,
-                                          BrowserThread::DeleteOnUIThread>;
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
+  friend class base::RefCountedThreadSafe<
+      DownloadManager, content::BrowserThread::DeleteOnUIThread>;
+  friend struct content::BrowserThread::DeleteOnThread<
+      content::BrowserThread::UI>;
   friend class DeleteTask<DownloadManager>;
 
   virtual ~DownloadManager();
diff --git a/content/browser/download/download_request_handle.cc b/content/browser/download/download_request_handle.cc
index 8d1561b..638006e 100644
--- a/content/browser/download/download_request_handle.cc
+++ b/content/browser/download/download_request_handle.cc
@@ -12,6 +12,8 @@
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 // IO Thread indirections to resource dispatcher host.
 // Provided as targets for PostTask from within this object
 // only.
diff --git a/content/browser/download/download_resource_handler.cc b/content/browser/download/download_resource_handler.cc
index ab22e56..51e197c 100644
--- a/content/browser/download/download_resource_handler.cc
+++ b/content/browser/download/download_resource_handler.cc
@@ -28,6 +28,8 @@
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_context.h"
 
+using content::BrowserThread;
+
 DownloadResourceHandler::DownloadResourceHandler(
     ResourceDispatcherHost* rdh,
     int render_process_host_id,
diff --git a/content/browser/download/drag_download_file.cc b/content/browser/download/drag_download_file.cc
index 2b578c7..e42127d 100644
--- a/content/browser/download/drag_download_file.cc
+++ b/content/browser/download/drag_download_file.cc
@@ -13,6 +13,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "net/base/file_stream.h"
 
+using content::BrowserThread;
+
 DragDownloadFile::DragDownloadFile(
     const FilePath& file_name_or_path,
     linked_ptr<net::FileStream> file_stream,
diff --git a/content/browser/download/drag_download_util.cc b/content/browser/download/drag_download_util.cc
index 1483d06..f112e96 100644
--- a/content/browser/download/drag_download_util.cc
+++ b/content/browser/download/drag_download_util.cc
@@ -16,6 +16,7 @@
 #include "net/base/file_stream.h"
 #include "net/base/net_errors.h"
 
+using content::BrowserThread;
 using net::FileStream;
 
 namespace drag_download_util {
diff --git a/content/browser/download/mhtml_generation_manager.cc b/content/browser/download/mhtml_generation_manager.cc
index 3c8f76c..784e427 100644
--- a/content/browser/download/mhtml_generation_manager.cc
+++ b/content/browser/download/mhtml_generation_manager.cc
@@ -12,6 +12,8 @@
 #include "content/common/view_messages.h"
 #include "content/public/browser/notification_types.h"
 
+using content::BrowserThread;
+
 MHTMLGenerationManager::Job::Job()
     : browser_file(base::kInvalidPlatformFileValue),
       renderer_file(IPC::InvalidPlatformFileForTransit()),
diff --git a/content/browser/download/mhtml_generation_manager.h b/content/browser/download/mhtml_generation_manager.h
index 704e2ee..eeb6b04 100644
--- a/content/browser/download/mhtml_generation_manager.h
+++ b/content/browser/download/mhtml_generation_manager.h
@@ -18,8 +18,8 @@ class FilePath;
 class TabContents;
 
 class CONTENT_EXPORT MHTMLGenerationManager
-    : public base::RefCountedThreadSafe<MHTMLGenerationManager,
-                                        BrowserThread::DeleteOnUIThread> {
+    : public base::RefCountedThreadSafe<
+          MHTMLGenerationManager, content::BrowserThread::DeleteOnUIThread> {
  public:
   MHTMLGenerationManager();
   ~MHTMLGenerationManager();
diff --git a/content/browser/download/save_file.cc b/content/browser/download/save_file.cc
index c03abc7..980f46e 100644
--- a/content/browser/download/save_file.cc
+++ b/content/browser/download/save_file.cc
@@ -8,6 +8,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "net/base/file_stream.h"
 
+using content::BrowserThread;
+
 SaveFile::SaveFile(const SaveFileCreateInfo* info)
     : BaseFile(FilePath(), info->url, GURL(), 0, linked_ptr<net::FileStream>()),
       info_(info) {
diff --git a/content/browser/download/save_file_manager.cc b/content/browser/download/save_file_manager.cc
index 26e7664..5325336 100644
--- a/content/browser/download/save_file_manager.cc
+++ b/content/browser/download/save_file_manager.cc
@@ -22,6 +22,8 @@
 #include "net/base/io_buffer.h"
 #include "net/base/net_util.h"
 
+using content::BrowserThread;
+
 SaveFileManager::SaveFileManager(ResourceDispatcherHost* rdh)
     : next_id_(0),
       resource_dispatcher_host_(rdh) {
diff --git a/content/browser/download/save_file_resource_handler.cc b/content/browser/download/save_file_resource_handler.cc
index 67de144..146e0df 100644
--- a/content/browser/download/save_file_resource_handler.cc
+++ b/content/browser/download/save_file_resource_handler.cc
@@ -13,6 +13,8 @@
 #include "net/base/io_buffer.h"
 #include "net/url_request/url_request_status.h"
 
+using content::BrowserThread;
+
 SaveFileResourceHandler::SaveFileResourceHandler(int render_process_host_id,
                                                  int render_view_id,
                                                  const GURL& url,
diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc
index 03a8614..a0dca3b 100644
--- a/content/browser/download/save_package.cc
+++ b/content/browser/download/save_package.cc
@@ -43,6 +43,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageSerializerClient.h"
 
 using base::Time;
+using content::BrowserThread;
 using WebKit::WebPageSerializerClient;
 
 namespace {
diff --git a/content/browser/download/save_package_unittest.cc b/content/browser/download/save_package_unittest.cc
index 4742ac9..b91ba2e 100644
--- a/content/browser/download/save_package_unittest.cc
+++ b/content/browser/download/save_package_unittest.cc
@@ -29,6 +29,8 @@ using content::BrowserThreadImpl;
 #define FPL_HTML_EXTENSION ".html"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 // This constant copied from save_package.cc.
diff --git a/content/browser/file_system/browser_file_system_helper.cc b/content/browser/file_system/browser_file_system_helper.cc
index 0d0c0218..4161cad 100644
--- a/content/browser/file_system/browser_file_system_helper.cc
+++ b/content/browser/file_system/browser_file_system_helper.cc
@@ -10,6 +10,8 @@
 #include "content/public/common/content_switches.h"
 #include "webkit/quota/quota_manager.h"
 
+using content::BrowserThread;
+
 scoped_refptr<fileapi::FileSystemContext> CreateFileSystemContext(
         const FilePath& profile_path, bool is_incognito,
         quota::SpecialStoragePolicy* special_storage_policy,
diff --git a/content/browser/file_system/file_system_browsertest.cc b/content/browser/file_system/file_system_browsertest.cc
index 671d4fd..945cd33 100644
--- a/content/browser/file_system/file_system_browsertest.cc
+++ b/content/browser/file_system/file_system_browsertest.cc
@@ -15,6 +15,7 @@
 #include "content/public/common/content_switches.h"
 #include "webkit/quota/quota_manager.h"
 
+using content::BrowserThread;
 using quota::QuotaManager;
 
 // This browser test is aimed towards exercising the FileAPI bindings and
diff --git a/content/browser/file_system/file_system_dispatcher_host.cc b/content/browser/file_system/file_system_dispatcher_host.cc
index 92694a7..cf6b79f 100644
--- a/content/browser/file_system/file_system_dispatcher_host.cc
+++ b/content/browser/file_system/file_system_dispatcher_host.cc
@@ -23,6 +23,7 @@
 #include "webkit/fileapi/file_system_quota_util.h"
 #include "webkit/fileapi/file_system_util.h"
 
+using content::BrowserThread;
 using fileapi::FileSystemCallbackDispatcher;
 using fileapi::FileSystemFileUtil;
 using fileapi::FileSystemOperation;
diff --git a/content/browser/file_system/file_system_dispatcher_host.h b/content/browser/file_system/file_system_dispatcher_host.h
index 07a16e0..063fe77 100644
--- a/content/browser/file_system/file_system_dispatcher_host.h
+++ b/content/browser/file_system/file_system_dispatcher_host.h
@@ -45,8 +45,9 @@ class FileSystemDispatcherHost : public BrowserMessageFilter {
 
   // BrowserMessageFilter implementation.
   virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
-  virtual void OverrideThreadForMessage(const IPC::Message& message,
-                                        BrowserThread::ID* thread) OVERRIDE;
+  virtual void OverrideThreadForMessage(
+      const IPC::Message& message,
+      content::BrowserThread::ID* thread) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message,
                                  bool* message_was_ok) OVERRIDE;
 
diff --git a/content/browser/geolocation/core_location_data_provider_mac.mm b/content/browser/geolocation/core_location_data_provider_mac.mm
index 09e7cf3..1a86edd 100644
--- a/content/browser/geolocation/core_location_data_provider_mac.mm
+++ b/content/browser/geolocation/core_location_data_provider_mac.mm
@@ -17,6 +17,8 @@
 #include "content/browser/geolocation/core_location_provider_mac.h"
 #include "content/browser/geolocation/geolocation_provider.h"
 
+using content::BrowserThread;
+
 // A few required declarations since the CoreLocation headers are not available
 // with the Mac OS X 10.5 SDK.
 // TODO(jorgevillatoro): Remove these declarations when we build against 10.6
diff --git a/content/browser/geolocation/geolocation_dispatcher_host.cc b/content/browser/geolocation/geolocation_dispatcher_host.cc
index 4f28934..8458b3a 100644
--- a/content/browser/geolocation/geolocation_dispatcher_host.cc
+++ b/content/browser/geolocation/geolocation_dispatcher_host.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -16,6 +16,8 @@
 #include "content/common/geolocation_messages.h"
 #include "content/common/geoposition.h"
 
+using content::BrowserThread;
+
 namespace {
 class GeolocationDispatcherHostImpl : public GeolocationDispatcherHost,
                                       public GeolocationObserver {
diff --git a/content/browser/geolocation/gps_location_provider_unittest_linux.cc b/content/browser/geolocation/gps_location_provider_unittest_linux.cc
index b8b8894..cdcf009 100644
--- a/content/browser/geolocation/gps_location_provider_unittest_linux.cc
+++ b/content/browser/geolocation/gps_location_provider_unittest_linux.cc
@@ -7,6 +7,7 @@
 #include "content/browser/geolocation/libgps_wrapper_linux.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using content::BrowserThreadImpl;
 
 struct gps_data_t {
diff --git a/content/browser/gpu/gpu_data_manager.cc b/content/browser/gpu/gpu_data_manager.cc
index bb0fb51..c37865e 100644
--- a/content/browser/gpu/gpu_data_manager.cc
+++ b/content/browser/gpu/gpu_data_manager.cc
@@ -28,6 +28,8 @@
 #include "ui/gfx/gl/gl_switches.h"
 #include "webkit/plugins/plugin_switches.h"
 
+using content::BrowserThread;
+
 namespace {
 
 enum GpuFeatureStatus {
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index 9909f75..305bbb9 100644
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -33,6 +33,8 @@
 #include "ui/gfx/gtk_native_view_id_manager.h"
 #endif
 
+using content::BrowserThread;
+
 bool GpuProcessHost::gpu_enabled_ = true;
 
 namespace {
diff --git a/content/browser/gpu/gpu_process_host_ui_shim.cc b/content/browser/gpu/gpu_process_host_ui_shim.cc
index dc0057c..d6f9830 100644
--- a/content/browser/gpu/gpu_process_host_ui_shim.cc
+++ b/content/browser/gpu/gpu_process_host_ui_shim.cc
@@ -26,6 +26,8 @@
 #include <gdk/gdkx.h>  // NOLINT
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 // One of the linux specific headers defines this as a macro.
diff --git a/content/browser/host_zoom_map.cc b/content/browser/host_zoom_map.cc
index 7d8904d..cec946a 100644
--- a/content/browser/host_zoom_map.cc
+++ b/content/browser/host_zoom_map.cc
@@ -18,6 +18,7 @@
 #include "net/base/net_util.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 
+using content::BrowserThread;
 using WebKit::WebView;
 
 HostZoomMap::HostZoomMap()
diff --git a/content/browser/host_zoom_map.h b/content/browser/host_zoom_map.h
index d51e2c7..d3232d3 100644
--- a/content/browser/host_zoom_map.h
+++ b/content/browser/host_zoom_map.h
@@ -31,8 +31,8 @@ class GURL;
 // to notifications on there (and holds a NotificationRegistrar).
 class CONTENT_EXPORT HostZoomMap
     : public content::NotificationObserver,
-      public base::RefCountedThreadSafe<HostZoomMap,
-                                        BrowserThread::DeleteOnUIThread> {
+      public base::RefCountedThreadSafe<
+          HostZoomMap, content::BrowserThread::DeleteOnUIThread> {
  public:
   explicit HostZoomMap();
   explicit HostZoomMap(HostZoomMap* original);
@@ -81,9 +81,10 @@ class CONTENT_EXPORT HostZoomMap
   HostZoomMap* GetOriginal() const { return original_; }
 
  private:
-  friend class base::RefCountedThreadSafe<HostZoomMap,
-                                          BrowserThread::DeleteOnUIThread>;
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
+  friend class base::RefCountedThreadSafe<
+      HostZoomMap, content::BrowserThread::DeleteOnUIThread>;
+  friend struct content::BrowserThread::DeleteOnThread<
+      content::BrowserThread::UI>;
   friend class DeleteTask<HostZoomMap>;
 
   typedef std::map<std::string, double> HostZoomLevels;
diff --git a/content/browser/in_process_webkit/dom_storage_browsertest.cc b/content/browser/in_process_webkit/dom_storage_browsertest.cc
index 93fc04d..469c503 100644
--- a/content/browser/in_process_webkit/dom_storage_browsertest.cc
+++ b/content/browser/in_process_webkit/dom_storage_browsertest.cc
@@ -11,6 +11,8 @@
 #include "content/browser/in_process_webkit/dom_storage_context.h"
 #include "content/browser/in_process_webkit/webkit_context.h"
 
+using content::BrowserThread;
+
 typedef InProcessBrowserTest DOMStorageBrowserTest;
 
 // In proc browser test is needed here because ClearLocalState indirectly calls
diff --git a/content/browser/in_process_webkit/dom_storage_context.cc b/content/browser/in_process_webkit/dom_storage_context.cc
index 383568a..1926baf 100644
--- a/content/browser/in_process_webkit/dom_storage_context.cc
+++ b/content/browser/in_process_webkit/dom_storage_context.cc
@@ -20,6 +20,8 @@
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/quota/special_storage_policy.h"
 
+using content::BrowserThread;
+
 using WebKit::WebSecurityOrigin;
 
 namespace {
diff --git a/content/browser/in_process_webkit/dom_storage_message_filter.cc b/content/browser/in_process_webkit/dom_storage_message_filter.cc
index 2c19058..52a3c0e 100644
--- a/content/browser/in_process_webkit/dom_storage_message_filter.cc
+++ b/content/browser/in_process_webkit/dom_storage_message_filter.cc
@@ -13,6 +13,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 
+using content::BrowserThread;
 using WebKit::WebStorageArea;
 
 DOMStorageMessageFilter* DOMStorageMessageFilter::storage_event_message_filter =
diff --git a/content/browser/in_process_webkit/dom_storage_message_filter.h b/content/browser/in_process_webkit/dom_storage_message_filter.h
index 6cef6f4..1717320 100644
--- a/content/browser/in_process_webkit/dom_storage_message_filter.h
+++ b/content/browser/in_process_webkit/dom_storage_message_filter.h
@@ -27,8 +27,9 @@ class DOMStorageMessageFilter : public BrowserMessageFilter {
 
   // BrowserMessageFilter implementation
   virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
-  virtual void OverrideThreadForMessage(const IPC::Message& message,
-                                        BrowserThread::ID* thread) OVERRIDE;
+  virtual void OverrideThreadForMessage(
+      const IPC::Message& message,
+      content::BrowserThread::ID* thread) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message,
                                  bool* message_was_ok) OVERRIDE;
   virtual void OnDestruct() const OVERRIDE;
@@ -39,7 +40,7 @@ class DOMStorageMessageFilter : public BrowserMessageFilter {
       const string16& origin, const GURL& url, bool is_local_storage);
 
  private:
-  friend class BrowserThread;
+  friend class content::BrowserThread;
   friend class DeleteTask<DOMStorageMessageFilter>;
   virtual ~DOMStorageMessageFilter();
 
diff --git a/content/browser/in_process_webkit/dom_storage_unittest.cc b/content/browser/in_process_webkit/dom_storage_unittest.cc
index 7f37f02..593c3b3 100644
--- a/content/browser/in_process_webkit/dom_storage_unittest.cc
+++ b/content/browser/in_process_webkit/dom_storage_unittest.cc
@@ -10,6 +10,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/quota/mock_special_storage_policy.h"
 
+using content::BrowserThread;
 using content::BrowserThreadImpl;
 
 class DOMStorageTest : public testing::Test {
diff --git a/content/browser/in_process_webkit/indexed_db_browsertest.cc b/content/browser/in_process_webkit/indexed_db_browsertest.cc
index 5525aba..d7e3433 100644
--- a/content/browser/in_process_webkit/indexed_db_browsertest.cc
+++ b/content/browser/in_process_webkit/indexed_db_browsertest.cc
@@ -23,6 +23,7 @@
 #include "webkit/quota/quota_manager.h"
 #include "webkit/quota/special_storage_policy.h"
 
+using content::BrowserThread;
 using quota::QuotaManager;
 using webkit_database::DatabaseUtil;
 
diff --git a/content/browser/in_process_webkit/indexed_db_context.cc b/content/browser/in_process_webkit/indexed_db_context.cc
index d3c22d6..b54c83f 100644
--- a/content/browser/in_process_webkit/indexed_db_context.cc
+++ b/content/browser/in_process_webkit/indexed_db_context.cc
@@ -26,6 +26,7 @@
 #include "webkit/quota/quota_manager.h"
 #include "webkit/quota/special_storage_policy.h"
 
+using content::BrowserThread;
 using webkit_database::DatabaseUtil;
 using WebKit::WebIDBDatabase;
 using WebKit::WebIDBFactory;
diff --git a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
index 86e3e497..baa1410 100644
--- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
+++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
@@ -30,6 +30,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
 #include "webkit/glue/webkit_glue.h"
 
+using content::BrowserThread;
 using WebKit::WebDOMStringList;
 using WebKit::WebExceptionCode;
 using WebKit::WebIDBCallbacks;
diff --git a/content/browser/in_process_webkit/indexed_db_dispatcher_host.h b/content/browser/in_process_webkit/indexed_db_dispatcher_host.h
index 874587c..3494c62 100644
--- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.h
+++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.h
@@ -45,7 +45,7 @@ class IndexedDBDispatcherHost : public BrowserMessageFilter {
   // BrowserMessageFilter implementation.
   virtual void OnChannelClosing();
   virtual void OverrideThreadForMessage(const IPC::Message& message,
-                                        BrowserThread::ID* thread);
+                                        content::BrowserThread::ID* thread);
   virtual bool OnMessageReceived(const IPC::Message& message,
                                  bool* message_was_ok);
 
diff --git a/content/browser/in_process_webkit/indexed_db_key_utility_client.cc b/content/browser/in_process_webkit/indexed_db_key_utility_client.cc
index 397e293..7a50f3a 100644
--- a/content/browser/in_process_webkit/indexed_db_key_utility_client.cc
+++ b/content/browser/in_process_webkit/indexed_db_key_utility_client.cc
@@ -13,6 +13,8 @@
 #include "content/common/utility_messages.h"
 #include "content/public/common/serialized_script_value.h"
 
+using content::BrowserThread;
+
 // This class is used to obtain IndexedDBKeys from SerializedScriptValues
 // given an IDBKeyPath. It uses UtilityProcess to do this inside a sandbox
 // (a V8 lock is required there). At this level, all methods are synchronous
diff --git a/content/browser/in_process_webkit/indexed_db_quota_client.cc b/content/browser/in_process_webkit/indexed_db_quota_client.cc
index ce60d83..675735e 100644
--- a/content/browser/in_process_webkit/indexed_db_quota_client.cc
+++ b/content/browser/in_process_webkit/indexed_db_quota_client.cc
@@ -12,6 +12,7 @@
 #include "net/base/net_util.h"
 #include "webkit/database/database_util.h"
 
+using content::BrowserThread;
 using quota::QuotaClient;
 using webkit_database::DatabaseUtil;
 
diff --git a/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc b/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc
index 9a1ff60..f9b6742 100644
--- a/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc
+++ b/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc
@@ -19,6 +19,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/database/database_util.h"
 
+using content::BrowserThread;
 
 // Declared to shorten the line lengths.
 static const quota::StorageType kTemp = quota::kStorageTypeTemporary;
diff --git a/content/browser/in_process_webkit/webkit_context.cc b/content/browser/in_process_webkit/webkit_context.cc
index 04fdc53..b0f25aa 100644
--- a/content/browser/in_process_webkit/webkit_context.cc
+++ b/content/browser/in_process_webkit/webkit_context.cc
@@ -8,6 +8,8 @@
 #include "base/command_line.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 WebKitContext::WebKitContext(
     bool is_incognito, const FilePath& data_path,
     quota::SpecialStoragePolicy* special_storage_policy,
diff --git a/content/browser/in_process_webkit/webkit_context_unittest.cc b/content/browser/in_process_webkit/webkit_context_unittest.cc
index affe29f..af5a439 100644
--- a/content/browser/in_process_webkit/webkit_context_unittest.cc
+++ b/content/browser/in_process_webkit/webkit_context_unittest.cc
@@ -8,6 +8,7 @@
 #include "content/test/test_browser_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using content::BrowserThreadImpl;
 
 class MockDOMStorageContext : public DOMStorageContext {
diff --git a/content/browser/in_process_webkit/webkit_thread.cc b/content/browser/in_process_webkit/webkit_thread.cc
index 128de28..072a1bb 100644
--- a/content/browser/in_process_webkit/webkit_thread.cc
+++ b/content/browser/in_process_webkit/webkit_thread.cc
@@ -11,6 +11,8 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "webkit/glue/webkit_glue.h"
 
+using content::BrowserThread;
+
 WebKitThread::WebKitThread() {
 }
 
diff --git a/content/browser/in_process_webkit/webkit_thread_unittest.cc b/content/browser/in_process_webkit/webkit_thread_unittest.cc
index ea56026..6662ed4 100644
--- a/content/browser/in_process_webkit/webkit_thread_unittest.cc
+++ b/content/browser/in_process_webkit/webkit_thread_unittest.cc
@@ -1,10 +1,12 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/in_process_webkit/webkit_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 TEST(WebKitThreadTest, DISABLED_ExposedInBrowserThread) {
   int* null = NULL;  // Help the template system out.
   EXPECT_FALSE(BrowserThread::DeleteSoon(BrowserThread::WEBKIT,
diff --git a/content/browser/mach_broker_mac.cc b/content/browser/mach_broker_mac.cc
index d27c8ba..b604f48 100644
--- a/content/browser/mach_broker_mac.cc
+++ b/content/browser/mach_broker_mac.cc
@@ -19,6 +19,8 @@
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/content_switches.h"
 
+using content::BrowserThread;
+
 namespace {
 // Prints a string representation of a Mach error code.
 std::string MachErrorCode(kern_return_t err) {
diff --git a/content/browser/mime_registry_message_filter.cc b/content/browser/mime_registry_message_filter.cc
index 375470d..ef7e994 100644
--- a/content/browser/mime_registry_message_filter.cc
+++ b/content/browser/mime_registry_message_filter.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,6 +7,8 @@
 #include "content/common/mime_registry_messages.h"
 #include "net/base/mime_util.h"
 
+using content::BrowserThread;
+
 MimeRegistryMessageFilter::MimeRegistryMessageFilter() {
 }
 
diff --git a/content/browser/mime_registry_message_filter.h b/content/browser/mime_registry_message_filter.h
index cdb6a86..1274055 100644
--- a/content/browser/mime_registry_message_filter.h
+++ b/content/browser/mime_registry_message_filter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -13,7 +13,7 @@ class MimeRegistryMessageFilter : public BrowserMessageFilter {
   MimeRegistryMessageFilter();
 
   virtual void OverrideThreadForMessage(const IPC::Message& message,
-                                        BrowserThread::ID* thread);
+                                        content::BrowserThread::ID* thread);
   virtual bool OnMessageReceived(const IPC::Message& message,
                                  bool* message_was_ok);
 
diff --git a/content/browser/net/url_request_slow_download_job.cc b/content/browser/net/url_request_slow_download_job.cc
index bbdcc44..0a37fed 100644
--- a/content/browser/net/url_request_slow_download_job.cc
+++ b/content/browser/net/url_request_slow_download_job.cc
@@ -16,6 +16,8 @@
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_filter.h"
 
+using content::BrowserThread;
+
 const char URLRequestSlowDownloadJob::kUnknownSizeUrl[] =
   "http://url.handled.by.slow.download/download-unknown-size";
 const char URLRequestSlowDownloadJob::kKnownSizeUrl[] =
diff --git a/content/browser/plugin_loader_posix.cc b/content/browser/plugin_loader_posix.cc
index 613e125..a1ccaac 100644
--- a/content/browser/plugin_loader_posix.cc
+++ b/content/browser/plugin_loader_posix.cc
@@ -12,6 +12,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 
+using content::BrowserThread;
 using webkit::npapi::PluginList;
 
 PluginLoaderPosix::PluginLoaderPosix()
diff --git a/content/browser/plugin_loader_posix_unittest.cc b/content/browser/plugin_loader_posix_unittest.cc
index 1ed4080..5b83ae4 100644
--- a/content/browser/plugin_loader_posix_unittest.cc
+++ b/content/browser/plugin_loader_posix_unittest.cc
@@ -14,6 +14,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/plugins/webplugininfo.h"
 
+using content::BrowserThread;
 using content::BrowserThreadImpl;
 
 class MockPluginLoaderPosix : public PluginLoaderPosix {
diff --git a/content/browser/plugin_process_host.cc b/content/browser/plugin_process_host.cc
index 3207d35..475a4ef 100644
--- a/content/browser/plugin_process_host.cc
+++ b/content/browser/plugin_process_host.cc
@@ -33,6 +33,8 @@
 #include "ui/gfx/gl/gl_switches.h"
 #include "ui/gfx/native_widget_types.h"
 
+using content::BrowserThread;
+
 #if defined(USE_X11)
 #include "ui/gfx/gtk_native_view_id_manager.h"
 #endif
diff --git a/content/browser/plugin_process_host_mac.cc b/content/browser/plugin_process_host_mac.cc
index 333cf05..95b9a84 100644
--- a/content/browser/plugin_process_host_mac.cc
+++ b/content/browser/plugin_process_host_mac.cc
@@ -15,6 +15,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "ui/gfx/rect.h"
 
+using content::BrowserThread;
+
 void PluginProcessHost::OnPluginSelectWindow(uint32 window_id,
                                              gfx::Rect window_rect,
                                              bool modal) {
diff --git a/content/browser/plugin_service.cc b/content/browser/plugin_service.cc
index 166ddf9..13f52d3 100644
--- a/content/browser/plugin_service.cc
+++ b/content/browser/plugin_service.cc
@@ -41,6 +41,7 @@
 using ::base::files::FilePathWatcher;
 #endif
 
+using content::BrowserThread;
 using content::PluginServiceFilter;
 
 namespace {
diff --git a/content/browser/plugin_service_browsertest.cc b/content/browser/plugin_service_browsertest.cc
index eb46f9f..116a6e1 100644
--- a/content/browser/plugin_service_browsertest.cc
+++ b/content/browser/plugin_service_browsertest.cc
@@ -17,6 +17,8 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 
+using content::BrowserThread;
+
 namespace {
 
 const char kNPAPITestPluginMimeType[] = "application/vnd.npapi-test";
diff --git a/content/browser/power_save_blocker_common.cc b/content/browser/power_save_blocker_common.cc
index 483d57c..8115b9c 100644
--- a/content/browser/power_save_blocker_common.cc
+++ b/content/browser/power_save_blocker_common.cc
@@ -7,6 +7,8 @@
 #include "base/bind.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 // Accessed only from the UI thread.
 int PowerSaveBlocker::blocker_count_[kPowerSaveBlockPreventStateCount];
 
diff --git a/content/browser/power_save_blocker_mac.cc b/content/browser/power_save_blocker_mac.cc
index 4bfcf19..edb5bdd 100644
--- a/content/browser/power_save_blocker_mac.cc
+++ b/content/browser/power_save_blocker_mac.cc
@@ -11,6 +11,8 @@
 #include "base/threading/thread.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Power management cannot be done on the UI thread. IOPMAssertionCreate does a
diff --git a/content/browser/power_save_blocker_win.cc b/content/browser/power_save_blocker_win.cc
index 1b63735..98df4de 100644
--- a/content/browser/power_save_blocker_win.cc
+++ b/content/browser/power_save_blocker_win.cc
@@ -8,6 +8,8 @@
 
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 // Called only from UI thread.
 // static
 void PowerSaveBlocker::ApplyBlock(PowerSaveBlockerType type) {
diff --git a/content/browser/renderer_host/accelerated_plugin_view_mac.mm b/content/browser/renderer_host/accelerated_plugin_view_mac.mm
index 69757c5..5325a7e 100644
--- a/content/browser/renderer_host/accelerated_plugin_view_mac.mm
+++ b/content/browser/renderer_host/accelerated_plugin_view_mac.mm
@@ -14,6 +14,8 @@
 #include "ui/gfx/gl/gl_switches.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
+using content::BrowserThread;
+
 @implementation AcceleratedPluginView
 
 - (void)drawView {
diff --git a/content/browser/renderer_host/blob_message_filter.cc b/content/browser/renderer_host/blob_message_filter.cc
index 6c09451..3c90dec 100644
--- a/content/browser/renderer_host/blob_message_filter.cc
+++ b/content/browser/renderer_host/blob_message_filter.cc
@@ -11,6 +11,7 @@
 #include "webkit/blob/blob_data.h"
 #include "webkit/blob/blob_storage_controller.h"
 
+using content::BrowserThread;
 using webkit_blob::BlobData;
 
 BlobMessageFilter::BlobMessageFilter(
diff --git a/content/browser/renderer_host/browser_render_process_host.cc b/content/browser/renderer_host/browser_render_process_host.cc
index 2e614cc..659cc410 100644
--- a/content/browser/renderer_host/browser_render_process_host.cc
+++ b/content/browser/renderer_host/browser_render_process_host.cc
@@ -101,6 +101,8 @@
 
 #include "third_party/skia/include/core/SkBitmap.h"
 
+using content::BrowserThread;
+
 // This class creates the IO thread for the renderer when running in
 // single-process mode.  It's not used in multi-process mode.
 class RendererMainThread : public base::Thread {
diff --git a/content/browser/renderer_host/clipboard_message_filter.cc b/content/browser/renderer_host/clipboard_message_filter.cc
index f1193c1..2193841 100644
--- a/content/browser/renderer_host/clipboard_message_filter.cc
+++ b/content/browser/renderer_host/clipboard_message_filter.cc
@@ -20,6 +20,8 @@
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/size.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Completes a clipboard write initiated by the renderer. The write must be
diff --git a/content/browser/renderer_host/clipboard_message_filter.h b/content/browser/renderer_host/clipboard_message_filter.h
index 4843f0d..db165ae 100644
--- a/content/browser/renderer_host/clipboard_message_filter.h
+++ b/content/browser/renderer_host/clipboard_message_filter.h
@@ -19,7 +19,7 @@ class ClipboardMessageFilter : public BrowserMessageFilter {
   ClipboardMessageFilter();
 
   virtual void OverrideThreadForMessage(const IPC::Message& message,
-                                        BrowserThread::ID* thread);
+                                        content::BrowserThread::ID* thread);
   virtual bool OnMessageReceived(const IPC::Message& message,
                                  bool* message_was_ok);
  private:
diff --git a/content/browser/renderer_host/clipboard_message_filter_mac.mm b/content/browser/renderer_host/clipboard_message_filter_mac.mm
index b8e7be1..81faeb1 100644
--- a/content/browser/renderer_host/clipboard_message_filter_mac.mm
+++ b/content/browser/renderer_host/clipboard_message_filter_mac.mm
@@ -10,6 +10,8 @@
 #import "content/browser/find_pasteboard.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 // The number of utf16 code units that will be written to the find pasteboard,
 // longer texts are silently ignored. This is to prevent that a compromised
 // renderer can write unlimited amounts of data into the find pasteboard.
diff --git a/content/browser/renderer_host/database_message_filter.cc b/content/browser/renderer_host/database_message_filter.cc
index 53c46dd..5494b42 100644
--- a/content/browser/renderer_host/database_message_filter.cc
+++ b/content/browser/renderer_host/database_message_filter.cc
@@ -25,6 +25,7 @@
 #include "base/file_descriptor_posix.h"
 #endif
 
+using content::BrowserThread;
 using quota::QuotaManager;
 using quota::QuotaManagerProxy;
 using quota::QuotaStatusCode;
diff --git a/content/browser/renderer_host/database_message_filter.h b/content/browser/renderer_host/database_message_filter.h
index a87b5d8..2b71428 100644
--- a/content/browser/renderer_host/database_message_filter.h
+++ b/content/browser/renderer_host/database_message_filter.h
@@ -22,7 +22,7 @@ class DatabaseMessageFilter
   // BrowserMessageFilter implementation.
   virtual void OnChannelClosing();
   virtual void OverrideThreadForMessage(const IPC::Message& message,
-                                        BrowserThread::ID* thread);
+                                        content::BrowserThread::ID* thread);
   virtual bool OnMessageReceived(const IPC::Message& message,
                                  bool* message_was_ok);
 
diff --git a/content/browser/renderer_host/file_utilities_message_filter.cc b/content/browser/renderer_host/file_utilities_message_filter.cc
index fe48619..4cc2167 100644
--- a/content/browser/renderer_host/file_utilities_message_filter.cc
+++ b/content/browser/renderer_host/file_utilities_message_filter.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,6 +8,8 @@
 #include "content/browser/child_process_security_policy.h"
 #include "content/common/file_utilities_messages.h"
 
+using content::BrowserThread;
+
 FileUtilitiesMessageFilter::FileUtilitiesMessageFilter(int process_id)
     : process_id_(process_id) {
 }
diff --git a/content/browser/renderer_host/file_utilities_message_filter.h b/content/browser/renderer_host/file_utilities_message_filter.h
index 1003a6fe..fc42962 100644
--- a/content/browser/renderer_host/file_utilities_message_filter.h
+++ b/content/browser/renderer_host/file_utilities_message_filter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -24,7 +24,7 @@ class FileUtilitiesMessageFilter : public BrowserMessageFilter {
 
   // BrowserMessageFilter implementation.
   virtual void OverrideThreadForMessage(const IPC::Message& message,
-                                        BrowserThread::ID* thread);
+                                        content::BrowserThread::ID* thread);
   virtual bool OnMessageReceived(const IPC::Message& message,
                                  bool* message_was_ok);
  private:
diff --git a/content/browser/renderer_host/gpu_message_filter.cc b/content/browser/renderer_host/gpu_message_filter.cc
index ab9e52b..2811495 100644
--- a/content/browser/renderer_host/gpu_message_filter.cc
+++ b/content/browser/renderer_host/gpu_message_filter.cc
@@ -13,6 +13,8 @@
 #include "content/browser/renderer_host/render_widget_helper.h"
 #include "content/common/gpu/gpu_messages.h"
 
+using content::BrowserThread;
+
 GpuMessageFilter::GpuMessageFilter(int render_process_id,
                                    RenderWidgetHelper* render_widget_helper)
     : gpu_host_id_(0),
diff --git a/content/browser/renderer_host/gpu_message_filter.h b/content/browser/renderer_host/gpu_message_filter.h
index d4e3651..3730304 100644
--- a/content/browser/renderer_host/gpu_message_filter.h
+++ b/content/browser/renderer_host/gpu_message_filter.h
@@ -36,7 +36,7 @@ class GpuMessageFilter : public BrowserMessageFilter,
   virtual void OnDestruct() const;
 
  private:
-  friend class BrowserThread;
+  friend class content::BrowserThread;
   friend class DeleteTask<GpuMessageFilter>;
   virtual ~GpuMessageFilter();
 
diff --git a/content/browser/renderer_host/java_bridge_dispatcher_host.cc b/content/browser/renderer_host/java_bridge_dispatcher_host.cc
index 60e33fb..99576e9 100644
--- a/content/browser/renderer_host/java_bridge_dispatcher_host.cc
+++ b/content/browser/renderer_host/java_bridge_dispatcher_host.cc
@@ -14,6 +14,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 
+using content::BrowserThread;
+
 JavaBridgeDispatcherHost::JavaBridgeDispatcherHost(
     RenderViewHost* render_view_host)
     : render_view_host_(render_view_host) {
diff --git a/content/browser/renderer_host/media/audio_input_device_manager.cc b/content/browser/renderer_host/media/audio_input_device_manager.cc
index d3d5036..33d0bfd 100644
--- a/content/browser/renderer_host/media/audio_input_device_manager.cc
+++ b/content/browser/renderer_host/media/audio_input_device_manager.cc
@@ -10,6 +10,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "media/audio/audio_manager.h"
 
+using content::BrowserThread;
+
 namespace media_stream {
 
 const int AudioInputDeviceManager::kFakeOpenSessionId = 1;
diff --git a/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc b/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc
index 7813706..4d02ba4 100644
--- a/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc
+++ b/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc
@@ -18,6 +18,7 @@ using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::InSequence;
 using ::testing::Return;
+using content::BrowserThread;
 
 using content::BrowserThreadImpl;
 
diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.cc b/content/browser/renderer_host/media/audio_input_renderer_host.cc
index f000a82..1652b26 100644
--- a/content/browser/renderer_host/media/audio_input_renderer_host.cc
+++ b/content/browser/renderer_host/media/audio_input_renderer_host.cc
@@ -16,6 +16,7 @@
 #include "content/common/media/audio_messages.h"
 #include "ipc/ipc_logging.h"
 
+using content::BrowserThread;
 
 AudioInputRendererHost::AudioEntry::AudioEntry()
     : stream_id(0),
diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.h b/content/browser/renderer_host/media/audio_input_renderer_host.h
index dc3cffe..fe04a0a 100644
--- a/content/browser/renderer_host/media/audio_input_renderer_host.h
+++ b/content/browser/renderer_host/media/audio_input_renderer_host.h
@@ -127,7 +127,7 @@ class AudioInputRendererHost
 
  private:
   // TODO(henrika): extend test suite (compare AudioRenderHost)
-  friend class BrowserThread;
+  friend class content::BrowserThread;
   friend class DeleteTask<AudioInputRendererHost>;
 
   virtual ~AudioInputRendererHost();
diff --git a/content/browser/renderer_host/media/audio_renderer_host.cc b/content/browser/renderer_host/media/audio_renderer_host.cc
index 9119b26..2b2aa07 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host.cc
@@ -16,6 +16,7 @@
 #include "media/audio/audio_util.h"
 #include "ipc/ipc_logging.h"
 
+using content::BrowserThread;
 
 AudioRendererHost::AudioEntry::AudioEntry()
     : stream_id(0),
diff --git a/content/browser/renderer_host/media/audio_renderer_host.h b/content/browser/renderer_host/media/audio_renderer_host.h
index 2ec629f..6709111 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.h
+++ b/content/browser/renderer_host/media/audio_renderer_host.h
@@ -124,7 +124,7 @@ class CONTENT_EXPORT AudioRendererHost
 
  private:
   friend class AudioRendererHostTest;
-  friend class BrowserThread;
+  friend class content::BrowserThread;
   friend class DeleteTask<AudioRendererHost>;
   friend class MockAudioRendererHost;
   FRIEND_TEST_ALL_PREFIXES(AudioRendererHostTest, CreateMockStream);
diff --git a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
index 5b625a8..eab9675 100644
--- a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
@@ -27,6 +27,7 @@ using ::testing::InvokeWithoutArgs;
 using ::testing::Return;
 using ::testing::SaveArg;
 using ::testing::SetArgumentPointee;
+using content::BrowserThread;
 
 using content::BrowserThreadImpl;
 
diff --git a/content/browser/renderer_host/media/media_stream_device_settings.cc b/content/browser/renderer_host/media/media_stream_device_settings.cc
index 3edaf39..85c634e 100644
--- a/content/browser/renderer_host/media/media_stream_device_settings.cc
+++ b/content/browser/renderer_host/media/media_stream_device_settings.cc
@@ -10,6 +10,8 @@
 #include "content/common/media/media_stream_options.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace media_stream {
 
 typedef std::map<MediaStreamType, StreamDeviceInfoArray> DeviceMap;
diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
index ba4b8a0..d387a70 100644
--- a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
@@ -8,6 +8,8 @@
 #include "content/common/media/media_stream_messages.h"
 #include "content/common/media/media_stream_options.h"
 
+using content::BrowserThread;
+
 namespace media_stream {
 
 MediaStreamDispatcherHost::MediaStreamDispatcherHost(
diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
index a0d5f0e..7bde2e7 100644
--- a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
@@ -22,6 +22,7 @@ using ::testing::_;
 using ::testing::DeleteArg;
 using ::testing::DoAll;
 using ::testing::Return;
+using content::BrowserThread;
 
 using content::BrowserThreadImpl;
 
diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc
index 8c0a1130..a39464d 100644
--- a/content/browser/renderer_host/media/media_stream_manager.cc
+++ b/content/browser/renderer_host/media/media_stream_manager.cc
@@ -16,6 +16,8 @@
 #include "content/common/media/media_stream_options.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace media_stream {
 
 // Creates a random label used to identify requests.
diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc
index 286f7b4..266508c 100644
--- a/content/browser/renderer_host/media/video_capture_controller.cc
+++ b/content/browser/renderer_host/media/video_capture_controller.cc
@@ -11,6 +11,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "media/base/yuv_convert.h"
 
+using content::BrowserThread;
+
 // The number of TransportDIBs VideoCaptureController allocate.
 static const size_t kNoOfDIBS = 3;
 
diff --git a/content/browser/renderer_host/media/video_capture_host.cc b/content/browser/renderer_host/media/video_capture_host.cc
index ef60b4b..ece9c11 100644
--- a/content/browser/renderer_host/media/video_capture_host.cc
+++ b/content/browser/renderer_host/media/video_capture_host.cc
@@ -11,6 +11,8 @@
 #include "content/browser/resource_context.h"
 #include "content/common/media/video_capture_messages.h"
 
+using content::BrowserThread;
+
 VideoCaptureHost::VideoCaptureHost(
     const content::ResourceContext* resource_context)
     : resource_context_(resource_context) {
diff --git a/content/browser/renderer_host/media/video_capture_host.h b/content/browser/renderer_host/media/video_capture_host.h
index b5dfebc..65e275c 100644
--- a/content/browser/renderer_host/media/video_capture_host.h
+++ b/content/browser/renderer_host/media/video_capture_host.h
@@ -75,7 +75,7 @@ class CONTENT_EXPORT VideoCaptureHost
   virtual void OnReadyToDelete(const VideoCaptureControllerID& id);
 
  private:
-  friend class BrowserThread;
+  friend class content::BrowserThread;
   friend class DeleteTask<VideoCaptureHost>;
   friend class MockVideoCaptureHost;
   friend class VideoCaptureHostTest;
diff --git a/content/browser/renderer_host/media/video_capture_host_unittest.cc b/content/browser/renderer_host/media/video_capture_host_unittest.cc
index ffaa8322..866f2b3 100644
--- a/content/browser/renderer_host/media/video_capture_host_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_host_unittest.cc
@@ -31,6 +31,7 @@ using ::testing::DoAll;
 using ::testing::InSequence;
 using ::testing::Mock;
 using ::testing::Return;
+using content::BrowserThread;
 
 using content::BrowserThreadImpl;
 
diff --git a/content/browser/renderer_host/media/video_capture_manager.cc b/content/browser/renderer_host/media/video_capture_manager.cc
index 3a7e87f..97f102b 100644
--- a/content/browser/renderer_host/media/video_capture_manager.cc
+++ b/content/browser/renderer_host/media/video_capture_manager.cc
@@ -10,6 +10,8 @@
 #include "media/video/capture/fake_video_capture_device.h"
 #include "media/video/capture/video_capture_device.h"
 
+using content::BrowserThread;
+
 namespace media_stream {
 
 // Starting id for the first capture session.
diff --git a/content/browser/renderer_host/media/video_capture_manager_unittest.cc b/content/browser/renderer_host/media/video_capture_manager_unittest.cc
index db2510e..10d888a 100644
--- a/content/browser/renderer_host/media/video_capture_manager_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_manager_unittest.cc
@@ -22,6 +22,7 @@ using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::InSequence;
 using ::testing::Return;
+using content::BrowserThread;
 
 using content::BrowserThreadImpl;
 
diff --git a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc
index 2141aec..fdc8cf0 100644
--- a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc
+++ b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc
@@ -16,6 +16,8 @@
 #include "net/base/single_request_host_resolver.h"
 #include "net/base/sys_addrinfo.h"
 
+using content::BrowserThread;
+
 namespace content {
 
 class P2PSocketDispatcherHost::DnsRequest {
diff --git a/content/browser/renderer_host/pepper_file_message_filter.cc b/content/browser/renderer_host/pepper_file_message_filter.cc
index b288975..5c84a8c 100644
--- a/content/browser/renderer_host/pepper_file_message_filter.cc
+++ b/content/browser/renderer_host/pepper_file_message_filter.cc
@@ -21,6 +21,8 @@
 #include "base/file_descriptor_posix.h"
 #endif
 
+using content::BrowserThread;
+
 // Used to check if the renderer has permission for the requested operation.
 // TODO(viettrungluu): Verify these. They don't necessarily quite make sense,
 // but it seems to be approximately what the file system code does.
diff --git a/content/browser/renderer_host/pepper_file_message_filter.h b/content/browser/renderer_host/pepper_file_message_filter.h
index 6fa662c..d281ff4 100644
--- a/content/browser/renderer_host/pepper_file_message_filter.h
+++ b/content/browser/renderer_host/pepper_file_message_filter.h
@@ -36,7 +36,7 @@ class PepperFileMessageFilter : public BrowserMessageFilter {
 
   // BrowserMessageFilter methods:
   virtual void OverrideThreadForMessage(const IPC::Message& message,
-                                        BrowserThread::ID* thread);
+                                        content::BrowserThread::ID* thread);
   virtual bool OnMessageReceived(const IPC::Message& message,
                                  bool* message_was_ok);
   virtual void OnDestruct() const;
@@ -44,7 +44,7 @@ class PepperFileMessageFilter : public BrowserMessageFilter {
   int child_id() const { return child_id_; }
 
  private:
-  friend class BrowserThread;
+  friend class content::BrowserThread;
   friend class DeleteTask<PepperFileMessageFilter>;
   virtual ~PepperFileMessageFilter();
 
diff --git a/content/browser/renderer_host/pepper_message_filter.cc b/content/browser/renderer_host/pepper_message_filter.cc
index 434a6d8..a04162f 100644
--- a/content/browser/renderer_host/pepper_message_filter.cc
+++ b/content/browser/renderer_host/pepper_message_filter.cc
@@ -50,6 +50,8 @@
 #include <unistd.h>
 #endif  // ENABLE_FLAPPER_HACKS
 
+using content::BrowserThread;
+
 namespace {
 
 bool ValidateNetAddress(const PP_Flash_NetAddress& addr) {
diff --git a/content/browser/renderer_host/redirect_to_file_resource_handler.cc b/content/browser/renderer_host/redirect_to_file_resource_handler.cc
index 25e4914..dc107fe 100644
--- a/content/browser/renderer_host/redirect_to_file_resource_handler.cc
+++ b/content/browser/renderer_host/redirect_to_file_resource_handler.cc
@@ -18,6 +18,7 @@
 #include "net/base/net_errors.h"
 #include "webkit/blob/deletable_file_reference.h"
 
+using content::BrowserThread;
 using webkit_blob::DeletableFileReference;
 
 // TODO(darin): Use the buffer sizing algorithm from AsyncResourceHandler.
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index 9222836..e18fba1 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -64,8 +64,9 @@
 #include "base/file_descriptor_posix.h"
 #endif
 
-using net::CookieStore;
+using content::BrowserThread;
 using content::PluginServiceFilter;
+using net::CookieStore;
 
 namespace {
 
diff --git a/content/browser/renderer_host/render_message_filter.h b/content/browser/renderer_host/render_message_filter.h
index 22b9616..c6bbd35 100644
--- a/content/browser/renderer_host/render_message_filter.h
+++ b/content/browser/renderer_host/render_message_filter.h
@@ -100,7 +100,7 @@ class RenderMessageFilter : public BrowserMessageFilter {
   net::URLRequestContext* GetRequestContextForURL(const GURL& url);
 
  private:
-  friend class BrowserThread;
+  friend class content::BrowserThread;
   friend class DeleteTask<RenderMessageFilter>;
 
   class OpenChannelToNpapiPluginCallback;
diff --git a/content/browser/renderer_host/render_process_host.cc b/content/browser/renderer_host/render_process_host.cc
index 50fac3f..5c59da9 100644
--- a/content/browser/renderer_host/render_process_host.cc
+++ b/content/browser/renderer_host/render_process_host.cc
@@ -18,6 +18,8 @@
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_switches.h"
 
+using content::BrowserThread;
+
 namespace {
 
 size_t max_renderer_count_override = 0;
diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc
index 950bc56..b9e2cfa 100644
--- a/content/browser/renderer_host/render_view_host.cc
+++ b/content/browser/renderer_host/render_view_host.cc
@@ -53,6 +53,7 @@
 #include "webkit/glue/webdropdata.h"
 
 using base::TimeDelta;
+using content::BrowserThread;
 using WebKit::WebConsoleMessage;
 using WebKit::WebDragOperation;
 using WebKit::WebDragOperationNone;
diff --git a/content/browser/renderer_host/render_view_host_notification_task.h b/content/browser/renderer_host/render_view_host_notification_task.h
index c14f476..2629353 100644
--- a/content/browser/renderer_host/render_view_host_notification_task.h
+++ b/content/browser/renderer_host/render_view_host_notification_task.h
@@ -62,6 +62,7 @@ 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) {
+  using content::BrowserThread;
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       new RenderViewHostNotificationTask<Method, Params>(render_process_id,
@@ -86,6 +87,7 @@ inline void CallRenderViewHostRendererManagementDelegateHelper(
     int render_view_id,
     Method method,
     const Params& params) {
+  using content::BrowserThread;
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       new RenderViewHostNotificationTask<
diff --git a/content/browser/renderer_host/render_widget_helper.cc b/content/browser/renderer_host/render_widget_helper.cc
index 18a95e6..dab6348 100644
--- a/content/browser/renderer_host/render_widget_helper.cc
+++ b/content/browser/renderer_host/render_widget_helper.cc
@@ -12,6 +12,8 @@
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 // A Task used with InvokeLater that we hold a pointer to in pending_paints_.
 // Instances are deleted by MessageLoop after it calls their Run method.
 class RenderWidgetHelper::UpdateMsgProxy : public Task {
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index 9d7024f..8d9ff26 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -26,6 +26,7 @@
 #endif
 
 using base::TimeDelta;
+using content::BrowserThread;
 
 using content::BrowserThreadImpl;
 
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index ed0ebac..e13479e 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -48,6 +48,7 @@
 #include "webkit/glue/webaccessibility.h"
 #include "webkit/plugins/npapi/webplugin.h"
 
+using content::BrowserThread;
 using WebKit::WebInputEvent;
 using WebKit::WebInputEventFactory;
 using WebKit::WebMouseEvent;
diff --git a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm
index 83eb175..bca8d95 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm
@@ -12,6 +12,7 @@
 #import "ui/base/test/ui_cocoa_test_helper.h"
 #include "webkit/plugins/npapi/webplugin.h"
 
+using content::BrowserThread;
 using content::BrowserThreadImpl;
 
 class RenderWidgetHostViewMacTest : public RenderViewHostTestHarness {
diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc
index 27cbb61..4a8e2f3 100644
--- a/content/browser/renderer_host/render_widget_host_view_win.cc
+++ b/content/browser/renderer_host/render_widget_host_view_win.cc
@@ -55,6 +55,7 @@
 
 using base::TimeDelta;
 using base::TimeTicks;
+using content::BrowserThread;
 using ui::ViewProp;
 using WebKit::WebInputEvent;
 using WebKit::WebInputEventFactory;
diff --git a/content/browser/renderer_host/resource_dispatcher_host.cc b/content/browser/renderer_host/resource_dispatcher_host.cc
index 472c3fb..8da96b4 100644
--- a/content/browser/renderer_host/resource_dispatcher_host.cc
+++ b/content/browser/renderer_host/resource_dispatcher_host.cc
@@ -82,6 +82,7 @@
 using base::Time;
 using base::TimeDelta;
 using base::TimeTicks;
+using content::BrowserThread;
 using webkit_blob::DeletableFileReference;
 
 // ----------------------------------------------------------------------------
diff --git a/content/browser/renderer_host/resource_dispatcher_host_unittest.cc b/content/browser/renderer_host/resource_dispatcher_host_unittest.cc
index b3e282b..560c59d 100644
--- a/content/browser/renderer_host/resource_dispatcher_host_unittest.cc
+++ b/content/browser/renderer_host/resource_dispatcher_host_unittest.cc
@@ -33,6 +33,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/appcache/appcache_interfaces.h"
 
+using content::BrowserThread;
 using content::BrowserThreadImpl;
 
 // TODO(eroman): Write unit tests for SafeBrowsing that exercise
diff --git a/content/browser/renderer_host/resource_handler.h b/content/browser/renderer_host/resource_handler.h
index 7fca15a..85c7f2bc 100644
--- a/content/browser/renderer_host/resource_handler.h
+++ b/content/browser/renderer_host/resource_handler.h
@@ -30,7 +30,7 @@ class GURL;
 // See the implementations of this interface defined below.
 class ResourceHandler
     : public base::RefCountedThreadSafe<
-          ResourceHandler, BrowserThread::DeleteOnIOThread> {
+            ResourceHandler, content::BrowserThread::DeleteOnIOThread> {
  public:
   // Called as upload progress is made.
   virtual bool OnUploadProgress(int request_id,
@@ -87,7 +87,7 @@ class ResourceHandler
   virtual void OnDataDownloaded(int request_id, int bytes_downloaded) {}
 
  protected:
-  friend class BrowserThread;
+  friend class content::BrowserThread;
   friend class DeleteTask<ResourceHandler>;
 
   virtual ~ResourceHandler() {}
diff --git a/content/browser/renderer_host/resource_queue.cc b/content/browser/renderer_host/resource_queue.cc
index 8821425..84fef80 100644
--- a/content/browser/renderer_host/resource_queue.cc
+++ b/content/browser/renderer_host/resource_queue.cc
@@ -9,6 +9,8 @@
 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 ResourceQueueDelegate::~ResourceQueueDelegate() {
 }
 
diff --git a/content/browser/renderer_host/resource_queue_unittest.cc b/content/browser/renderer_host/resource_queue_unittest.cc
index 6a6e36f..873eac3 100644
--- a/content/browser/renderer_host/resource_queue_unittest.cc
+++ b/content/browser/renderer_host/resource_queue_unittest.cc
@@ -14,6 +14,7 @@
 #include "net/url_request/url_request.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using content::BrowserThreadImpl;
 using content::DummyResourceHandler;
 
diff --git a/content/browser/resolve_proxy_msg_helper_unittest.cc b/content/browser/resolve_proxy_msg_helper_unittest.cc
index b550b5b..388d6f2 100644
--- a/content/browser/resolve_proxy_msg_helper_unittest.cc
+++ b/content/browser/resolve_proxy_msg_helper_unittest.cc
@@ -13,6 +13,7 @@
 #include "net/proxy/proxy_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using content::BrowserThreadImpl;
 
 // This ProxyConfigService always returns "http://pac" as the PAC url to use.
diff --git a/content/browser/site_instance_unittest.cc b/content/browser/site_instance_unittest.cc
index bd7cff13..4559d8b 100644
--- a/content/browser/site_instance_unittest.cc
+++ b/content/browser/site_instance_unittest.cc
@@ -23,6 +23,7 @@
 #include "googleurl/src/url_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using content::BrowserThreadImpl;
 
 namespace {
diff --git a/content/browser/speech/speech_input_dispatcher_host.cc b/content/browser/speech/speech_input_dispatcher_host.cc
index 62a9048..aacb90a3 100644
--- a/content/browser/speech/speech_input_dispatcher_host.cc
+++ b/content/browser/speech/speech_input_dispatcher_host.cc
@@ -9,6 +9,8 @@
 #include "content/common/speech_input_messages.h"
 #include "content/public/browser/content_browser_client.h"
 
+using content::BrowserThread;
+
 namespace speech_input {
 
 //----------------------------- SpeechInputCallers -----------------------------
diff --git a/content/browser/speech/speech_input_manager.cc b/content/browser/speech/speech_input_manager.cc
index 2019b6e..b597c22 100644
--- a/content/browser/speech/speech_input_manager.cc
+++ b/content/browser/speech/speech_input_manager.cc
@@ -9,6 +9,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "media/audio/audio_manager.h"
 
+using content::BrowserThread;
+
 namespace speech_input {
 
 SpeechInputManager::SpeechInputManager()
diff --git a/content/browser/speech/speech_recognizer.cc b/content/browser/speech/speech_recognizer.cc
index 4ee9421..09705c9 100644
--- a/content/browser/speech/speech_recognizer.cc
+++ b/content/browser/speech/speech_recognizer.cc
@@ -9,6 +9,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "net/url_request/url_request_context_getter.h"
 
+using content::BrowserThread;
 using media::AudioInputController;
 using std::string;
 
diff --git a/content/browser/speech/speech_recognizer_unittest.cc b/content/browser/speech/speech_recognizer_unittest.cc
index bd3dd8a00..cb2d27b 100644
--- a/content/browser/speech/speech_recognizer_unittest.cc
+++ b/content/browser/speech/speech_recognizer_unittest.cc
@@ -12,8 +12,8 @@
 #include "net/url_request/url_request_status.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using content::BrowserThreadImpl;
-
 using media::AudioInputController;
 using media::TestAudioInputController;
 using media::TestAudioInputControllerFactory;
diff --git a/content/browser/ssl/ssl_client_auth_handler.cc b/content/browser/ssl/ssl_client_auth_handler.cc
index f78636e..03db71a 100644
--- a/content/browser/ssl/ssl_client_auth_handler.cc
+++ b/content/browser/ssl/ssl_client_auth_handler.cc
@@ -16,6 +16,8 @@
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 
+using content::BrowserThread;
+
 SSLClientAuthHandler::SSLClientAuthHandler(
     net::URLRequest* request,
     net::SSLCertRequestInfo* cert_request_info)
diff --git a/content/browser/ssl/ssl_client_auth_handler.h b/content/browser/ssl/ssl_client_auth_handler.h
index 019ffaf..ac0c5a1 100644
--- a/content/browser/ssl/ssl_client_auth_handler.h
+++ b/content/browser/ssl/ssl_client_auth_handler.h
@@ -25,8 +25,8 @@ class X509Certificate;
 // It is self-owned and deletes itself when the UI reports the user selection or
 // when the net::URLRequest is cancelled.
 class CONTENT_EXPORT SSLClientAuthHandler
-    : public base::RefCountedThreadSafe<SSLClientAuthHandler,
-                                        BrowserThread::DeleteOnIOThread> {
+    : public base::RefCountedThreadSafe<
+          SSLClientAuthHandler, content::BrowserThread::DeleteOnIOThread> {
  public:
   SSLClientAuthHandler(net::URLRequest* request,
                        net::SSLCertRequestInfo* cert_request_info);
@@ -61,9 +61,9 @@ class CONTENT_EXPORT SSLClientAuthHandler
   virtual ~SSLClientAuthHandler();
 
  private:
-  friend class base::RefCountedThreadSafe<SSLClientAuthHandler,
-                                          BrowserThread::DeleteOnIOThread>;
-  friend class BrowserThread;
+  friend class base::RefCountedThreadSafe<
+      SSLClientAuthHandler, content::BrowserThread::DeleteOnIOThread>;
+  friend class content::BrowserThread;
   friend class DeleteTask<SSLClientAuthHandler>;
 
   // Notifies that the user has selected a cert.
diff --git a/content/browser/ssl/ssl_error_handler.cc b/content/browser/ssl/ssl_error_handler.cc
index 8fb462a..11dbb3d 100644
--- a/content/browser/ssl/ssl_error_handler.cc
+++ b/content/browser/ssl/ssl_error_handler.cc
@@ -15,6 +15,8 @@
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request.h"
 
+using content::BrowserThread;
+
 SSLErrorHandler::SSLErrorHandler(ResourceDispatcherHost* rdh,
                                  net::URLRequest* request,
                                  ResourceType::Type resource_type)
diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc
index 17f2239..5aba471 100644
--- a/content/browser/ssl/ssl_manager.cc
+++ b/content/browser/ssl/ssl_manager.cc
@@ -22,6 +22,8 @@
 #include "content/public/browser/notification_source.h"
 #include "net/base/cert_status_flags.h"
 
+using content::BrowserThread;
+
 // static
 void SSLManager::OnSSLCertificateError(ResourceDispatcherHost* rdh,
                                        net::URLRequest* request,
diff --git a/content/browser/tab_contents/interstitial_page.cc b/content/browser/tab_contents/interstitial_page.cc
index d11987f..005968e 100644
--- a/content/browser/tab_contents/interstitial_page.cc
+++ b/content/browser/tab_contents/interstitial_page.cc
@@ -32,6 +32,7 @@
 #include "net/base/escape.h"
 #include "net/url_request/url_request_context_getter.h"
 
+using content::BrowserThread;
 using WebKit::WebDragOperation;
 using WebKit::WebDragOperationsMask;
 
diff --git a/content/browser/tab_contents/render_view_host_manager_unittest.cc b/content/browser/tab_contents/render_view_host_manager_unittest.cc
index f7f5f6d..c2d7117 100644
--- a/content/browser/tab_contents/render_view_host_manager_unittest.cc
+++ b/content/browser/tab_contents/render_view_host_manager_unittest.cc
@@ -21,6 +21,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/webkit_glue.h"
 
+using content::BrowserThread;
 using content::BrowserThreadImpl;
 
 class RenderViewHostManagerTest : public ChromeRenderViewHostTestHarness {
diff --git a/content/browser/tab_contents/web_drag_source_mac.mm b/content/browser/tab_contents/web_drag_source_mac.mm
index 35d0d6f..1a6531b 100644
--- a/content/browser/tab_contents/web_drag_source_mac.mm
+++ b/content/browser/tab_contents/web_drag_source_mac.mm
@@ -28,6 +28,7 @@
 using base::SysNSStringToUTF8;
 using base::SysUTF8ToNSString;
 using base::SysUTF16ToNSString;
+using content::BrowserThread;
 using net::FileStream;
 
 namespace {
diff --git a/content/browser/trace_controller.cc b/content/browser/trace_controller.cc
index 22beab8..9b380c0 100644
--- a/content/browser/trace_controller.cc
+++ b/content/browser/trace_controller.cc
@@ -11,6 +11,7 @@
 #include "content/browser/trace_message_filter.h"
 #include "content/common/child_process_messages.h"
 
+using content::BrowserThread;
 
 TraceController::TraceController() :
     subscriber_(NULL),
diff --git a/content/browser/trace_message_filter.cc b/content/browser/trace_message_filter.cc
index 6345888..98528e5 100644
--- a/content/browser/trace_message_filter.cc
+++ b/content/browser/trace_message_filter.cc
@@ -7,6 +7,7 @@
 #include "content/browser/trace_controller.h"
 #include "content/common/child_process_messages.h"
 
+using content::BrowserThread;
 
 TraceMessageFilter::TraceMessageFilter() :
     has_child_(false),
diff --git a/content/browser/user_metrics.cc b/content/browser/user_metrics.cc
index 8191418..6f0a35f 100644
--- a/content/browser/user_metrics.cc
+++ b/content/browser/user_metrics.cc
@@ -8,6 +8,8 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 
+using content::BrowserThread;
+
 void UserMetrics::RecordAction(const UserMetricsAction& action) {
   Record(action.str_);
 }
diff --git a/content/browser/utility_process_host.cc b/content/browser/utility_process_host.cc
index 51f3abd..f34a22f 100644
--- a/content/browser/utility_process_host.cc
+++ b/content/browser/utility_process_host.cc
@@ -14,6 +14,8 @@
 #include "ui/base/ui_base_switches.h"
 #include "webkit/plugins/plugin_switches.h"
 
+using content::BrowserThread;
+
 UtilityProcessHost::Client::Client() {
 }
 
diff --git a/content/browser/utility_process_host.h b/content/browser/utility_process_host.h
index 23d749a..82969aa 100644
--- a/content/browser/utility_process_host.h
+++ b/content/browser/utility_process_host.h
@@ -49,7 +49,8 @@ class CONTENT_EXPORT UtilityProcessHost : public BrowserChildProcessHost {
     DISALLOW_COPY_AND_ASSIGN(Client);
   };
 
-  UtilityProcessHost(Client* client, BrowserThread::ID client_thread_id);
+  UtilityProcessHost(Client* client,
+                     content::BrowserThread::ID client_thread_id);
   virtual ~UtilityProcessHost();
 
   // BrowserChildProcessHost override
@@ -87,7 +88,7 @@ class CONTENT_EXPORT UtilityProcessHost : public BrowserChildProcessHost {
 
   // A pointer to our client interface, who will be informed of progress.
   scoped_refptr<Client> client_;
-  BrowserThread::ID client_thread_id_;
+  content::BrowserThread::ID client_thread_id_;
   // True when running in batch mode, i.e., StartBatchMode() has been called
   // and the utility process will run until EndBatchMode().
   bool is_batch_mode_;
diff --git a/content/browser/worker_host/worker_message_filter.cc b/content/browser/worker_host/worker_message_filter.cc
index 0f58a73..2ce3396 100644
--- a/content/browser/worker_host/worker_message_filter.cc
+++ b/content/browser/worker_host/worker_message_filter.cc
@@ -10,6 +10,8 @@
 #include "content/common/view_messages.h"
 #include "content/common/worker_messages.h"
 
+using content::BrowserThread;
+
 WorkerMessageFilter::WorkerMessageFilter(
     int render_process_id,
     const content::ResourceContext* resource_context,
diff --git a/content/browser/worker_host/worker_process_host.cc b/content/browser/worker_host/worker_process_host.cc
index 2eabbeb..7d2fbfb 100644
--- a/content/browser/worker_host/worker_process_host.cc
+++ b/content/browser/worker_host/worker_process_host.cc
@@ -47,6 +47,8 @@
 #include "webkit/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/glue/resource_type.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Helper class that we pass to SocketStreamDispatcherHost so that it can find
diff --git a/content/browser/worker_host/worker_service.cc b/content/browser/worker_host/worker_service.cc
index b82a78c..f14f478 100644
--- a/content/browser/worker_host/worker_service.cc
+++ b/content/browser/worker_host/worker_service.cc
@@ -19,6 +19,8 @@
 #include "content/public/common/content_switches.h"
 #include "net/base/registry_controlled_domain.h"
 
+using content::BrowserThread;
+
 const int WorkerService::kMaxWorkerProcessesWhenSharing = 10;
 const int WorkerService::kMaxWorkersWhenSeparate = 64;
 const int WorkerService::kMaxWorkersPerTabWhenSeparate = 16;
author	joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2011-11-02 11:29:39 +0000
committer	joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2011-11-02 11:29:39 +0000
commit	631bb742a2798549af691af7357236ce0899b4cb (patch)
tree	1852356dc787a9c65e892ea1a57dfc03595d2bb4 /content/browser
parent	e301da283ab61ff78a108d5ed3246d8b09614ef2 (diff)
download	chromium_src-631bb742a2798549af691af7357236ce0899b4cb.zip chromium_src-631bb742a2798549af691af7357236ce0899b4cb.tar.gz chromium_src-631bb742a2798549af691af7357236ce0899b4cb.tar.bz2