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

820 files changed, 1497 insertions, 164 deletions

diff --git a/chrome/browser/aeropeek_manager.cc b/chrome/browser/aeropeek_manager.cc
index 3cd12f2..b88de5d 100644
--- a/chrome/browser/aeropeek_manager.cc
+++ b/chrome/browser/aeropeek_manager.cc
@@ -42,6 +42,8 @@
 
 #pragma comment(lib, "dwmapi.lib")
 
+using content::BrowserThread;
+
 namespace {
 
 // Sends a thumbnail bitmap to Windows. Windows assumes this function is called
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 12e6e5c..f28af68 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -73,6 +73,8 @@
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/models/accelerator_cocoa.h"
 
+using content::BrowserThread;
+
 // 10.6 adds a public API for the Spotlight-backed search menu item in the Help
 // menu.  Provide the declaration so it can be called below when building with
 // the 10.5 SDK.
diff --git a/chrome/browser/autocomplete/history_contents_provider_unittest.cc b/chrome/browser/autocomplete/history_contents_provider_unittest.cc
index dafb3ef..2a17ba8 100644
--- a/chrome/browser/autocomplete/history_contents_provider_unittest.cc
+++ b/chrome/browser/autocomplete/history_contents_provider_unittest.cc
@@ -20,6 +20,8 @@
 using base::Time;
 using base::TimeDelta;
 
+using content::BrowserThread;
+
 namespace {
 
 struct TestEntry {
diff --git a/chrome/browser/autocomplete/history_quick_provider_unittest.cc b/chrome/browser/autocomplete/history_quick_provider_unittest.cc
index 76a17dc..26ae72e 100644
--- a/chrome/browser/autocomplete/history_quick_provider_unittest.cc
+++ b/chrome/browser/autocomplete/history_quick_provider_unittest.cc
@@ -28,6 +28,8 @@
 using base::Time;
 using base::TimeDelta;
 
+using content::BrowserThread;
+
 struct TestURLInfo {
   std::string url;
   std::string title;
diff --git a/chrome/browser/autocomplete/history_url_provider_unittest.cc b/chrome/browser/autocomplete/history_url_provider_unittest.cc
index b981f3a..ac63a02 100644
--- a/chrome/browser/autocomplete/history_url_provider_unittest.cc
+++ b/chrome/browser/autocomplete/history_url_provider_unittest.cc
@@ -23,6 +23,8 @@
 using base::Time;
 using base::TimeDelta;
 
+using content::BrowserThread;
+
 struct TestURLInfo {
   const char* url;
   const char* title;
diff --git a/chrome/browser/autocomplete/network_action_predictor_unittest.cc b/chrome/browser/autocomplete/network_action_predictor_unittest.cc
index 53bec27..9bbaa05 100644
--- a/chrome/browser/autocomplete/network_action_predictor_unittest.cc
+++ b/chrome/browser/autocomplete/network_action_predictor_unittest.cc
@@ -14,6 +14,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace {
 
 struct TestUrlInfo {
diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc
index 082a062..763da4b 100644
--- a/chrome/browser/autocomplete/search_provider_unittest.cc
+++ b/chrome/browser/autocomplete/search_provider_unittest.cc
@@ -23,6 +23,8 @@
 #include "net/url_request/url_request_status.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 // The following environment is configured for these tests:
 // . The TemplateURL default_t_url_ is set as the default provider.
 // . The TemplateURL keyword_t_url_ is added to the TemplateURLService. This
diff --git a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc
index bd7e544..a23b308 100644
--- a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc
+++ b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc
@@ -29,6 +29,8 @@
 using base::Time;
 using base::TimeDelta;
 
+using content::BrowserThread;
+
 namespace {
 
 struct TestShortcutInfo {
diff --git a/chrome/browser/autocomplete_history_manager_unittest.cc b/chrome/browser/autocomplete_history_manager_unittest.cc
index f95374e..6a1047e 100644
--- a/chrome/browser/autocomplete_history_manager_unittest.cc
+++ b/chrome/browser/autocomplete_history_manager_unittest.cc
@@ -21,6 +21,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/form_data.h"
 
+using content::BrowserThread;
 using testing::_;
 using webkit_glue::FormData;
 
diff --git a/chrome/browser/autofill/address_unittest.cc b/chrome/browser/autofill/address_unittest.cc
index 2cd3d4d..b578cb6 100644
--- a/chrome/browser/autofill/address_unittest.cc
+++ b/chrome/browser/autofill/address_unittest.cc
@@ -12,6 +12,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 class AddressTest : public testing::Test {
  public:
   // In order to access the application locale -- which the tested functions do
diff --git a/chrome/browser/autofill/autofill_country.cc b/chrome/browser/autofill/autofill_country.cc
index a7ffd7b..4a83bd0 100644
--- a/chrome/browser/autofill/autofill_country.cc
+++ b/chrome/browser/autofill/autofill_country.cc
@@ -27,6 +27,8 @@
 #include "unicode/urename.h"
 #include "unicode/utypes.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // The maximum capacity needed to store a locale up to the country code.
diff --git a/chrome/browser/autofill/autofill_download_unittest.cc b/chrome/browser/autofill/autofill_download_unittest.cc
index 55c59e6..b90ce98 100644
--- a/chrome/browser/autofill/autofill_download_unittest.cc
+++ b/chrome/browser/autofill/autofill_download_unittest.cc
@@ -23,6 +23,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
 #include "webkit/glue/form_data.h"
 
+using content::BrowserThread;
 using webkit_glue::FormData;
 using webkit_glue::FormField;
 using WebKit::WebInputElement;
diff --git a/chrome/browser/autofill/autofill_manager_unittest.cc b/chrome/browser/autofill/autofill_manager_unittest.cc
index af71687..aac5a7a 100644
--- a/chrome/browser/autofill/autofill_manager_unittest.cc
+++ b/chrome/browser/autofill/autofill_manager_unittest.cc
@@ -41,6 +41,7 @@
 #include "webkit/glue/form_data.h"
 #include "webkit/glue/form_field.h"
 
+using content::BrowserThread;
 using testing::_;
 using webkit_glue::FormData;
 using webkit_glue::FormField;
diff --git a/chrome/browser/autofill/autofill_metrics_unittest.cc b/chrome/browser/autofill/autofill_metrics_unittest.cc
index fc86dc7..ea307c7 100644
--- a/chrome/browser/autofill/autofill_metrics_unittest.cc
+++ b/chrome/browser/autofill/autofill_metrics_unittest.cc
@@ -25,6 +25,7 @@
 #include "webkit/glue/form_data.h"
 #include "webkit/glue/form_field.h"
 
+using content::BrowserThread;
 using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::Mock;
diff --git a/chrome/browser/autofill/personal_data_manager_unittest.cc b/chrome/browser/autofill/personal_data_manager_unittest.cc
index f3a1f21..65323fb 100644
--- a/chrome/browser/autofill/personal_data_manager_unittest.cc
+++ b/chrome/browser/autofill/personal_data_manager_unittest.cc
@@ -27,6 +27,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/form_data.h"
 
+using content::BrowserThread;
 using webkit_glue::FormData;
 
 ACTION(QuitUIMessageLoop) {
diff --git a/chrome/browser/autofill/phone_number_i18n_unittest.cc b/chrome/browser/autofill/phone_number_i18n_unittest.cc
index d8c4611..762b908 100644
--- a/chrome/browser/autofill/phone_number_i18n_unittest.cc
+++ b/chrome/browser/autofill/phone_number_i18n_unittest.cc
@@ -12,6 +12,7 @@ using autofill_i18n::NormalizePhoneNumber;
 using autofill_i18n::ParsePhoneNumber;
 using autofill_i18n::ConstructPhoneNumber;
 using autofill_i18n::PhoneNumbersMatch;
+using content::BrowserThread;
 
 class PhoneNumberI18NTest : public testing::Test {
  public:
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index db8f052..ce93a20 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -103,6 +103,7 @@
 #include "chrome/browser/chromeos/login/user_manager.h"
 #endif  // defined(OS_CHROMEOS)
 
+using content::BrowserThread;
 using WebKit::WebFindOptions;
 using base::Time;
 
diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h
index c082065..2ad3b64 100644
--- a/chrome/browser/automation/automation_provider.h
+++ b/chrome/browser/automation/automation_provider.h
@@ -85,8 +85,8 @@ class AutomationProvider
     : public IPC::Channel::Listener,
       public IPC::Message::Sender,
       public base::SupportsWeakPtr<AutomationProvider>,
-      public base::RefCountedThreadSafe<AutomationProvider,
-                                        BrowserThread::DeleteOnUIThread>,
+      public base::RefCountedThreadSafe<
+          AutomationProvider, content::BrowserThread::DeleteOnUIThread>,
       public TraceSubscriber {
  public:
   explicit AutomationProvider(Profile* profile);
@@ -163,7 +163,8 @@ class AutomationProvider
       const DownloadItem* download);
 
  protected:
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
+  friend struct content::BrowserThread::DeleteOnThread<
+      content::BrowserThread::UI>;
   friend class DeleteTask<AutomationProvider>;
   virtual ~AutomationProvider();
 
diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc
index ca64410..c9be799 100644
--- a/chrome/browser/automation/automation_provider_observers.cc
+++ b/chrome/browser/automation/automation_provider_observers.cc
@@ -82,6 +82,8 @@
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/rect.h"
 
+using content::BrowserThread;
+
 // Holds onto start and stop timestamps for a particular tab
 class InitialLoadObserver::TabTime {
  public:
diff --git a/chrome/browser/automation/automation_provider_observers.h b/chrome/browser/automation/automation_provider_observers.h
index ad51f80..6a42122 100644
--- a/chrome/browser/automation/automation_provider_observers.h
+++ b/chrome/browser/automation/automation_provider_observers.h
@@ -1241,7 +1241,7 @@ class AutomationProviderGetPasswordsObserver : public PasswordStoreConsumer {
 class PasswordStoreLoginsChangedObserver
     : public base::RefCountedThreadSafe<
           PasswordStoreLoginsChangedObserver,
-          BrowserThread::DeleteOnUIThread>,
+          content::BrowserThread::DeleteOnUIThread>,
       public content::NotificationObserver {
  public:
   PasswordStoreLoginsChangedObserver(AutomationProvider* automation,
@@ -1259,7 +1259,8 @@ class PasswordStoreLoginsChangedObserver
                        const content::NotificationDetails& details);
 
  private:
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
+  friend struct content::BrowserThread::DeleteOnThread<
+      content::BrowserThread::UI>;
   friend class DeleteTask<PasswordStoreLoginsChangedObserver>;
 
   // Registers the appropriate observers.  Called on the DB thread.
@@ -1464,7 +1465,7 @@ class AutofillDisplayedObserver : public content::NotificationObserver {
 class AutofillChangedObserver
     : public base::RefCountedThreadSafe<
           AutofillChangedObserver,
-          BrowserThread::DeleteOnUIThread>,
+          content::BrowserThread::DeleteOnUIThread>,
       public content::NotificationObserver {
  public:
   AutofillChangedObserver(AutomationProvider* automation,
@@ -1482,7 +1483,8 @@ class AutofillChangedObserver
                        const content::NotificationDetails& details);
 
  private:
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
+  friend struct content::BrowserThread::DeleteOnThread<
+      content::BrowserThread::UI>;
   friend class DeleteTask<AutofillChangedObserver>;
 
   // Registers the appropriate observers.  Called on the DB thread.
@@ -1712,13 +1714,14 @@ class NewTabObserver : public content::NotificationObserver {
 class WaitForProcessLauncherThreadToGoIdleObserver
     : public base::RefCountedThreadSafe<
           WaitForProcessLauncherThreadToGoIdleObserver,
-          BrowserThread::DeleteOnUIThread> {
+          content::BrowserThread::DeleteOnUIThread> {
  public:
   WaitForProcessLauncherThreadToGoIdleObserver(
       AutomationProvider* automation, IPC::Message* reply_message);
 
  private:
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
+  friend struct content::BrowserThread::DeleteOnThread<
+      content::BrowserThread::UI>;
   friend class DeleteTask<WaitForProcessLauncherThreadToGoIdleObserver>;
 
   virtual ~WaitForProcessLauncherThreadToGoIdleObserver();
diff --git a/chrome/browser/automation/automation_provider_unittest.cc b/chrome/browser/automation/automation_provider_unittest.cc
index d4dd565..c29e5b5 100644
--- a/chrome/browser/automation/automation_provider_unittest.cc
+++ b/chrome/browser/automation/automation_provider_unittest.cc
@@ -8,6 +8,8 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 class MockChromeFrameAutomationProvider
     : public ChromeFrameAutomationProvider {
  public:
diff --git a/chrome/browser/automation/automation_resource_message_filter.cc b/chrome/browser/automation/automation_resource_message_filter.cc
index 771d3ab..ec5ae69 100644
--- a/chrome/browser/automation/automation_resource_message_filter.cc
+++ b/chrome/browser/automation/automation_resource_message_filter.cc
@@ -21,6 +21,8 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_filter.h"
 
+using content::BrowserThread;
+
 base::LazyInstance<AutomationResourceMessageFilter::RenderViewMap>
     AutomationResourceMessageFilter::filtered_render_views_(
         base::LINKER_INITIALIZED);
diff --git a/chrome/browser/automation/automation_tab_helper_unittest.cc b/chrome/browser/automation/automation_tab_helper_unittest.cc
index d858a2c..11056ea 100644
--- a/chrome/browser/automation/automation_tab_helper_unittest.cc
+++ b/chrome/browser/automation/automation_tab_helper_unittest.cc
@@ -15,6 +15,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using testing::_;
 
 class AutomationTabHelperTest : public TabContentsWrapperTestHarness {
diff --git a/chrome/browser/automation/automation_util.cc b/chrome/browser/automation/automation_util.cc
index 00b2a27..4bb707d 100644
--- a/chrome/browser/automation/automation_util.cc
+++ b/chrome/browser/automation/automation_util.cc
@@ -27,6 +27,8 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
+using content::BrowserThread;
+
 namespace {
 
 void GetCookiesCallback(base::WaitableEvent* event,
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index b7a2f89..c4f0dfa 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -140,6 +140,7 @@
 #endif
 
 using automation_util::SendErrorIfModalDialogActive;
+using content::BrowserThread;
 
 namespace {
 
diff --git a/chrome/browser/automation/ui_controls_mac.mm b/chrome/browser/automation/ui_controls_mac.mm
index f3f8b83..41a4fdd 100644
--- a/chrome/browser/automation/ui_controls_mac.mm
+++ b/chrome/browser/automation/ui_controls_mac.mm
@@ -15,6 +15,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/keycodes/keyboard_code_conversion_mac.h"
 
+using content::BrowserThread;
+
 // Implementation details: We use [NSApplication sendEvent:] instead
 // of [NSApplication postEvent:atStart:] so that the event gets sent
 // immediately.  This lets us run the post-event task right
diff --git a/chrome/browser/automation/url_request_automation_job.cc b/chrome/browser/automation/url_request_automation_job.cc
index 365da8d..8ddd479 100644
--- a/chrome/browser/automation/url_request_automation_job.cc
+++ b/chrome/browser/automation/url_request_automation_job.cc
@@ -25,6 +25,7 @@
 
 using base::Time;
 using base::TimeDelta;
+using content::BrowserThread;
 
 // The list of filtered headers that are removed from requests sent via
 // StartAsync(). These must be lower case.
diff --git a/chrome/browser/background/background_mode_manager_gtk.cc b/chrome/browser/background/background_mode_manager_gtk.cc
index 2c81206..c6ae8a4 100644
--- a/chrome/browser/background/background_mode_manager_gtk.cc
+++ b/chrome/browser/background/background_mode_manager_gtk.cc
@@ -21,6 +21,8 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 namespace {
 
 class DisableLaunchOnStartupTask : public Task {
diff --git a/chrome/browser/background/background_mode_manager_mac.mm b/chrome/browser/background/background_mode_manager_mac.mm
index 2635894..120aa37 100644
--- a/chrome/browser/background/background_mode_manager_mac.mm
+++ b/chrome/browser/background/background_mode_manager_mac.mm
@@ -13,6 +13,8 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 namespace {
 
 class DisableLaunchOnStartupTask : public Task {
diff --git a/chrome/browser/background/background_mode_manager_win.cc b/chrome/browser/background/background_mode_manager_win.cc
index ed2baa8..1596a11 100644
--- a/chrome/browser/background/background_mode_manager_win.cc
+++ b/chrome/browser/background/background_mode_manager_win.cc
@@ -18,6 +18,8 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 namespace {
 
 class DisableLaunchOnStartupTask : public Task {
diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
index 80015be..f5705ba 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
@@ -21,6 +21,8 @@
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #endif
 
+using content::BrowserThread;
+
 // PageNavigator implementation that records the URL.
 class TestingPageNavigator : public PageNavigator {
  public:
diff --git a/chrome/browser/bookmarks/bookmark_expanded_state_tracker_unittest.cc b/chrome/browser/bookmarks/bookmark_expanded_state_tracker_unittest.cc
index 1ec3ef6..0c5d412 100644
--- a/chrome/browser/bookmarks/bookmark_expanded_state_tracker_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_expanded_state_tracker_unittest.cc
@@ -10,6 +10,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 class BookmarkExpandedStateTrackerTest : public testing::Test {
  public:
   BookmarkExpandedStateTrackerTest();
diff --git a/chrome/browser/bookmarks/bookmark_extension_api.cc b/chrome/browser/bookmarks/bookmark_extension_api.cc
index 0742617..b6889ae 100644
--- a/chrome/browser/bookmarks/bookmark_extension_api.cc
+++ b/chrome/browser/bookmarks/bookmark_extension_api.cc
@@ -41,6 +41,7 @@
 namespace keys = bookmark_extension_api_constants;
 
 using base::TimeDelta;
+using content::BrowserThread;
 typedef QuotaLimitHeuristic::Bucket Bucket;
 typedef QuotaLimitHeuristic::Config Config;
 typedef QuotaLimitHeuristic::BucketList BucketList;
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
index c95565f4..6f4fde7 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
@@ -28,6 +28,8 @@
 #include "net/base/net_errors.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 namespace {
 
 static BookmarkFaviconFetcher* fetcher = NULL;
diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
index ab28ae9..6da3b3b 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
@@ -23,6 +23,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/codec/png_codec.h"
 
+using content::BrowserThread;
+
 namespace {
 
 static const int kIconWidth = 16;
diff --git a/chrome/browser/bookmarks/bookmark_index_unittest.cc b/chrome/browser/bookmarks/bookmark_index_unittest.cc
index 87118f5..76d5623 100644
--- a/chrome/browser/bookmarks/bookmark_index_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_index_unittest.cc
@@ -19,6 +19,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 class BookmarkIndexTest : public testing::Test {
  public:
   BookmarkIndexTest() : model_(new BookmarkModel(NULL)) {}
diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc
index 6a89f6c..b3cb34c 100644
--- a/chrome/browser/bookmarks/bookmark_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc
@@ -37,6 +37,7 @@
 
 using base::Time;
 using base::TimeDelta;
+using content::BrowserThread;
 
 namespace {
 
diff --git a/chrome/browser/bookmarks/bookmark_node_data_unittest.cc b/chrome/browser/bookmarks/bookmark_node_data_unittest.cc
index 9ec687a..c0c120a 100644
--- a/chrome/browser/bookmarks/bookmark_node_data_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_node_data_unittest.cc
@@ -15,6 +15,8 @@
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
 
+using content::BrowserThread;
+
 class BookmarkNodeDataTest : public testing::Test {
  public:
   BookmarkNodeDataTest()
diff --git a/chrome/browser/bookmarks/bookmark_storage.cc b/chrome/browser/bookmarks/bookmark_storage.cc
index b203910..5261429 100644
--- a/chrome/browser/bookmarks/bookmark_storage.cc
+++ b/chrome/browser/bookmarks/bookmark_storage.cc
@@ -19,6 +19,7 @@
 #include "content/public/browser/notification_source.h"
 
 using base::TimeTicks;
+using content::BrowserThread;
 
 namespace {
 
diff --git a/chrome/browser/bookmarks/recently_used_folders_combo_model_unittest.cc b/chrome/browser/bookmarks/recently_used_folders_combo_model_unittest.cc
index ebbb213f..abf0945 100644
--- a/chrome/browser/bookmarks/recently_used_folders_combo_model_unittest.cc
+++ b/chrome/browser/bookmarks/recently_used_folders_combo_model_unittest.cc
@@ -10,6 +10,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 class RecentlyUsedFoldersComboModelTest : public testing::Test {
  public:
   RecentlyUsedFoldersComboModelTest();
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 16d2dcf..6e4d126 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -90,6 +90,7 @@
 
 using base::Time;
 using base::TimeDelta;
+using content::BrowserThread;
 
 #if defined(USE_TCMALLOC)
 // static
diff --git a/chrome/browser/browser_about_handler_unittest.cc b/chrome/browser/browser_about_handler_unittest.cc
index 3fc83ff..ebed73a 100644
--- a/chrome/browser/browser_about_handler_unittest.cc
+++ b/chrome/browser/browser_about_handler_unittest.cc
@@ -12,6 +12,8 @@
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 typedef testing::Test BrowserAboutHandlerTest;
 
 TEST_F(BrowserAboutHandlerTest, WillHandleBrowserAboutURL) {
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 81c463a..55cdd5b 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -129,6 +129,8 @@ static bool g_end_session_file_thread_has_completed = false;
 static const int kEndSessionTimeoutSeconds = 10;
 #endif
 
+using content::BrowserThread;
+
 BrowserProcessImpl::BrowserProcessImpl(const CommandLine& command_line)
     : created_resource_dispatcher_host_(false),
       created_metrics_service_(false),
@@ -893,7 +895,7 @@ void BrowserProcessImpl::CreateCacheThread() {
   created_cache_thread_ = true;
 
   scoped_ptr<base::Thread> thread(
-      new DeprecatedBrowserThread(BrowserThread::CACHE));
+      new content::DeprecatedBrowserThread(BrowserThread::CACHE));
   base::Thread::Options options;
   options.message_loop_type = MessageLoop::TYPE_IO;
   if (!thread->StartWithOptions(options))
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc
index c0610b9..81df85d 100644
--- a/chrome/browser/browser_shutdown.cc
+++ b/chrome/browser/browser_shutdown.cc
@@ -53,6 +53,7 @@
 
 using base::Time;
 using base::TimeDelta;
+using content::BrowserThread;
 
 namespace browser_shutdown {
 
diff --git a/chrome/browser/browsing_data_appcache_helper.cc b/chrome/browser/browsing_data_appcache_helper.cc
index f88e21e..b30fbb4 100644
--- a/chrome/browser/browsing_data_appcache_helper.cc
+++ b/chrome/browser/browsing_data_appcache_helper.cc
@@ -13,6 +13,7 @@
 #include "webkit/appcache/appcache_storage.h"
 
 using appcache::AppCacheDatabase;
+using content::BrowserThread;
 
 BrowsingDataAppCacheHelper::BrowsingDataAppCacheHelper(Profile* profile)
     : is_fetching_(false),
diff --git a/chrome/browser/browsing_data_cookie_helper.cc b/chrome/browser/browsing_data_cookie_helper.cc
index 3352fb3..c048de1 100644
--- a/chrome/browser/browsing_data_cookie_helper.cc
+++ b/chrome/browser/browsing_data_cookie_helper.cc
@@ -13,6 +13,8 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
+using content::BrowserThread;
+
 BrowsingDataCookieHelper::BrowsingDataCookieHelper(Profile* profile)
   : is_fetching_(false),
     profile_(profile),
diff --git a/chrome/browser/browsing_data_cookie_helper_unittest.cc b/chrome/browser/browsing_data_cookie_helper_unittest.cc
index 81ab3ff..ef652cb 100644
--- a/chrome/browser/browsing_data_cookie_helper_unittest.cc
+++ b/chrome/browser/browsing_data_cookie_helper_unittest.cc
@@ -13,6 +13,8 @@
 #include "net/url_request/url_request_context_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace {
 
 class BrowsingDataCookieHelperTest : public testing::Test {
diff --git a/chrome/browser/browsing_data_database_helper.cc b/chrome/browser/browsing_data_database_helper.cc
index a960457..0737a58 100644
--- a/chrome/browser/browsing_data_database_helper.cc
+++ b/chrome/browser/browsing_data_database_helper.cc
@@ -16,6 +16,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 
+using content::BrowserThread;
 using WebKit::WebSecurityOrigin;
 
 BrowsingDataDatabaseHelper::DatabaseInfo::DatabaseInfo()
diff --git a/chrome/browser/browsing_data_database_helper_browsertest.cc b/chrome/browser/browsing_data_database_helper_browsertest.cc
index c85f1554..3889077 100644
--- a/chrome/browser/browsing_data_database_helper_browsertest.cc
+++ b/chrome/browser/browsing_data_database_helper_browsertest.cc
@@ -14,6 +14,8 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/test/test_browser_thread.h"
 
+using content::BrowserThread;
+
 namespace {
 typedef BrowsingDataHelperCallback<BrowsingDataDatabaseHelper::DatabaseInfo>
     TestCompletionCallback;
diff --git a/chrome/browser/browsing_data_file_system_helper.cc b/chrome/browser/browsing_data_file_system_helper.cc
index 8a523ef..9644ee4 100644
--- a/chrome/browser/browsing_data_file_system_helper.cc
+++ b/chrome/browser/browsing_data_file_system_helper.cc
@@ -18,6 +18,8 @@
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/sandbox_mount_point_provider.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // An implementation of the BrowsingDataFileSystemHelper interface that pulls
diff --git a/chrome/browser/browsing_data_file_system_helper_unittest.cc b/chrome/browser/browsing_data_file_system_helper_unittest.cc
index d8caf51..12a5876 100644
--- a/chrome/browser/browsing_data_file_system_helper_unittest.cc
+++ b/chrome/browser/browsing_data_file_system_helper_unittest.cc
@@ -16,6 +16,8 @@
 #include "webkit/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/sandbox_mount_point_provider.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Shorter names for fileapi::* constants.
diff --git a/chrome/browser/browsing_data_indexed_db_helper.cc b/chrome/browser/browsing_data_indexed_db_helper.cc
index ef68e99..b2c468f 100644
--- a/chrome/browser/browsing_data_indexed_db_helper.cc
+++ b/chrome/browser/browsing_data_indexed_db_helper.cc
@@ -18,6 +18,7 @@
 #include "webkit/database/database_util.h"
 #include "webkit/glue/webkit_glue.h"
 
+using content::BrowserThread;
 using webkit_database::DatabaseUtil;
 
 namespace {
diff --git a/chrome/browser/browsing_data_local_storage_helper.cc b/chrome/browser/browsing_data_local_storage_helper.cc
index e338839..28a176b 100644
--- a/chrome/browser/browsing_data_local_storage_helper.cc
+++ b/chrome/browser/browsing_data_local_storage_helper.cc
@@ -17,6 +17,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "webkit/glue/webkit_glue.h"
 
+using content::BrowserThread;
 using WebKit::WebSecurityOrigin;
 
 BrowsingDataLocalStorageHelper::LocalStorageInfo::LocalStorageInfo()
diff --git a/chrome/browser/browsing_data_local_storage_helper_browsertest.cc b/chrome/browser/browsing_data_local_storage_helper_browsertest.cc
index 27f98b9..77279ff 100644
--- a/chrome/browser/browsing_data_local_storage_helper_browsertest.cc
+++ b/chrome/browser/browsing_data_local_storage_helper_browsertest.cc
@@ -22,6 +22,8 @@
 #include "content/browser/in_process_webkit/webkit_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace {
 typedef
     BrowsingDataHelperCallback<BrowsingDataLocalStorageHelper::LocalStorageInfo>
diff --git a/chrome/browser/browsing_data_quota_helper_impl.cc b/chrome/browser/browsing_data_quota_helper_impl.cc
index 47e4f7f..4777e66 100644
--- a/chrome/browser/browsing_data_quota_helper_impl.cc
+++ b/chrome/browser/browsing_data_quota_helper_impl.cc
@@ -12,6 +12,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "webkit/quota/quota_manager.h"
 
+using content::BrowserThread;
+
 // static
 BrowsingDataQuotaHelper* BrowsingDataQuotaHelper::Create(Profile* profile) {
   return new BrowsingDataQuotaHelperImpl(
diff --git a/chrome/browser/browsing_data_quota_helper_unittest.cc b/chrome/browser/browsing_data_quota_helper_unittest.cc
index 94b54f4..032ff60 100644
--- a/chrome/browser/browsing_data_quota_helper_unittest.cc
+++ b/chrome/browser/browsing_data_quota_helper_unittest.cc
@@ -13,6 +13,8 @@
 #include "webkit/quota/mock_storage_client.h"
 #include "webkit/quota/quota_manager.h"
 
+using content::BrowserThread;
+
 class BrowsingDataQuotaHelperTest : public testing::Test {
  public:
   typedef BrowsingDataQuotaHelper::QuotaInfo QuotaInfo;
diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc
index 7199d6e..f2d30f4 100644
--- a/chrome/browser/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data_remover.cc
@@ -57,6 +57,8 @@
 #include "webkit/quota/quota_manager.h"
 #include "webkit/quota/quota_types.h"
 
+using content::BrowserThread;
+
 // Done so that we can use PostTask on BrowsingDataRemovers and not have
 // BrowsingDataRemover implement RefCounted.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(BrowsingDataRemover);
diff --git a/chrome/browser/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data_remover_unittest.cc
index 1d4dfc9..c2949777 100644
--- a/chrome/browser/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data_remover_unittest.cc
@@ -29,6 +29,8 @@
 #include "webkit/quota/quota_manager.h"
 #include "webkit/quota/quota_types.h"
 
+using content::BrowserThread;
+
 namespace {
 
 const char kTestkOrigin1[] = "http://host1:1/";
diff --git a/chrome/browser/bug_report_data.cc b/chrome/browser/bug_report_data.cc
index c320512..008a2f6 100644
--- a/chrome/browser/bug_report_data.cc
+++ b/chrome/browser/bug_report_data.cc
@@ -11,6 +11,8 @@
 #include "chrome/browser/chromeos/notifications/system_notification.h"
 #endif
 
+using content::BrowserThread;
+
 BugReportData::BugReportData()
     : profile_(NULL),
       problem_type_(0)
diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc
index 8fd55d6..ec433af 100644
--- a/chrome/browser/character_encoding.cc
+++ b/chrome/browser/character_encoding.cc
@@ -19,6 +19,8 @@
 #include "ui/base/l10n/l10n_util_collator.h"
 #include "unicode/ucnv.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // The maximum length of short list of recently user selected encodings is 3.
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index d7cd5b1..607c18d 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -208,6 +208,8 @@
 #include "ui/aura_shell/shell.h"
 #endif
 
+using content::BrowserThread;
+
 namespace net {
 class NetLog;
 }  // namespace net
diff --git a/chrome/browser/chrome_browser_main_posix.cc b/chrome/browser/chrome_browser_main_posix.cc
index 1a53281..f90bb57 100644
--- a/chrome/browser/chrome_browser_main_posix.cc
+++ b/chrome/browser/chrome_browser_main_posix.cc
@@ -25,6 +25,8 @@
 #include "chrome/browser/printing/print_dialog_gtk.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 // See comment in |PreEarlyInitialization()|, where sigaction is called.
diff --git a/chrome/browser/chrome_browser_main_x11.cc b/chrome/browser/chrome_browser_main_x11.cc
index 7e37763..8448ed5 100644
--- a/chrome/browser/chrome_browser_main_x11.cc
+++ b/chrome/browser/chrome_browser_main_x11.cc
@@ -18,6 +18,8 @@
 #include "chrome/app/breakpad_linux.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 // Indicates that we're currently responding to an IO error (by shutting down).
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 727c953..94856fd 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -126,6 +126,8 @@
 #include "content/browser/renderer_host/render_widget_host_view_mac.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 // Handles rewriting Web UI URLs.
diff --git a/chrome/browser/chrome_plugin_message_filter.cc b/chrome/browser/chrome_plugin_message_filter.cc
index 56e0cfc..0c49028 100644
--- a/chrome/browser/chrome_plugin_message_filter.cc
+++ b/chrome/browser/chrome_plugin_message_filter.cc
@@ -21,6 +21,8 @@
 #include "net/url_request/url_request_context_getter.h"
 #include "webkit/plugins/npapi/default_plugin_shared.h"
 
+using content::BrowserThread;
+
 static const char kDefaultPluginFinderURL[] =
     "https://dl-ssl.google.com/edgedl/chrome/plugins/plugins2.xml";
 
diff --git a/chrome/browser/chrome_plugin_service_filter.cc b/chrome/browser/chrome_plugin_service_filter.cc
index 99da949..c56db28 100644
--- a/chrome/browser/chrome_plugin_service_filter.cc
+++ b/chrome/browser/chrome_plugin_service_filter.cc
@@ -17,6 +17,7 @@
 #include "webkit/plugins/npapi/plugin_group.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 
+using content::BrowserThread;
 using webkit::npapi::PluginGroup;
 
 // static
diff --git a/chrome/browser/chrome_quota_permission_context.cc b/chrome/browser/chrome_quota_permission_context.cc
index 5e4ca68..3de352d 100644
--- a/chrome/browser/chrome_quota_permission_context.cc
+++ b/chrome/browser/chrome_quota_permission_context.cc
@@ -25,6 +25,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "webkit/quota/quota_types.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // If we requested larger quota than this threshold, show a different
diff --git a/chrome/browser/chrome_worker_message_filter.cc b/chrome/browser/chrome_worker_message_filter.cc
index 57535a2..5ed2c68 100644
--- a/chrome/browser/chrome_worker_message_filter.cc
+++ b/chrome/browser/chrome_worker_message_filter.cc
@@ -12,6 +12,8 @@
 #include "content/browser/worker_host/worker_process_host.h"
 #include "content/common/worker_messages.h"
 
+using content::BrowserThread;
+
 ChromeWorkerMessageFilter::ChromeWorkerMessageFilter(WorkerProcessHost* process)
     : process_(process) {
   ProfileIOData* io_data = reinterpret_cast<ProfileIOData*>(
diff --git a/chrome/browser/chromeos/audio_mixer_alsa.cc b/chrome/browser/chromeos/audio_mixer_alsa.cc
index 2db18fa..abc8c6c 100644
--- a/chrome/browser/chromeos/audio_mixer_alsa.cc
+++ b/chrome/browser/chromeos/audio_mixer_alsa.cc
@@ -23,6 +23,7 @@
 
 typedef long alsa_long_t;  // 'long' is required for ALSA API calls.
 
+using content::BrowserThread;
 using std::max;
 using std::min;
 using std::string;
diff --git a/chrome/browser/chromeos/boot_times_loader.cc b/chrome/browser/chromeos/boot_times_loader.cc
index 62ac68f..2b56dad 100644
--- a/chrome/browser/chromeos/boot_times_loader.cc
+++ b/chrome/browser/chromeos/boot_times_loader.cc
@@ -33,6 +33,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 
+using content::BrowserThread;
+
 namespace {
 
 RenderWidgetHost* GetRenderWidgetHost(NavigationController* tab) {
diff --git a/chrome/browser/chromeos/cros/burn_library.cc b/chrome/browser/chromeos/cros/burn_library.cc
index bc07a95..007005c 100644
--- a/chrome/browser/chromeos/cros/burn_library.cc
+++ b/chrome/browser/chromeos/cros/burn_library.cc
@@ -12,6 +12,8 @@
 #include "chrome/common/zip.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 class BurnLibraryImpl : public BurnLibrary,
diff --git a/chrome/browser/chromeos/cros/cert_library.cc b/chrome/browser/chromeos/cros/cert_library.cc
index 4709fe1..48c6e9f 100644
--- a/chrome/browser/chromeos/cros/cert_library.cc
+++ b/chrome/browser/chromeos/cros/cert_library.cc
@@ -19,6 +19,8 @@
 #include "ui/base/l10n/l10n_util_collator.h"
 #include "unicode/coll.h"  // icu::Collator
 
+using content::BrowserThread;
+
 //////////////////////////////////////////////////////////////////////////////
 
 namespace {
diff --git a/chrome/browser/chromeos/cros/cryptohome_library.cc b/chrome/browser/chromeos/cros/cryptohome_library.cc
index 955a2e8..5c38fca 100644
--- a/chrome/browser/chromeos/cros/cryptohome_library.cc
+++ b/chrome/browser/chromeos/cros/cryptohome_library.cc
@@ -12,6 +12,8 @@
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace {
   const char kStubSystemSalt[] = "stub_system_salt";
 }
diff --git a/chrome/browser/chromeos/cros/mock_mount_library.cc b/chrome/browser/chromeos/cros/mock_mount_library.cc
index c7ac747..87d03a6 100644
--- a/chrome/browser/chromeos/cros/mock_mount_library.cc
+++ b/chrome/browser/chromeos/cros/mock_mount_library.cc
@@ -11,6 +11,7 @@
 
 namespace chromeos {
 
+using content::BrowserThread;
 using testing::_;
 using testing::AnyNumber;
 using testing::Invoke;
diff --git a/chrome/browser/chromeos/cros/mount_library.cc b/chrome/browser/chromeos/cros/mount_library.cc
index ee9c170..c95b8ee 100644
--- a/chrome/browser/chromeos/cros/mount_library.cc
+++ b/chrome/browser/chromeos/cros/mount_library.cc
@@ -13,6 +13,8 @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 const char* kLibraryNotLoaded = "Cros Library not loaded";
 const char* kDeviceNotFound = "Device could not be found";
 
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc
index d44e050..03ddeea 100644
--- a/chrome/browser/chromeos/cros/network_library.cc
+++ b/chrome/browser/chromeos/cros/network_library.cc
@@ -42,6 +42,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/text/bytes_formatting.h"
 
+using content::BrowserThread;
+
 ////////////////////////////////////////////////////////////////////////////////
 // Implementation notes.
 // NetworkLibraryImpl manages a series of classes that describe network devices
diff --git a/chrome/browser/chromeos/cros/power_library.cc b/chrome/browser/chromeos/cros/power_library.cc
index 01aeb4b..f091e21 100644
--- a/chrome/browser/chromeos/cros/power_library.cc
+++ b/chrome/browser/chromeos/cros/power_library.cc
@@ -18,6 +18,8 @@
 #include "third_party/cros/chromeos_power.h"
 #include "third_party/cros/chromeos_resume.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 class PowerLibraryImpl : public PowerLibrary {
diff --git a/chrome/browser/chromeos/cros/screen_lock_library.cc b/chrome/browser/chromeos/cros/screen_lock_library.cc
index 96853cb..06537fa 100644
--- a/chrome/browser/chromeos/cros/screen_lock_library.cc
+++ b/chrome/browser/chromeos/cros/screen_lock_library.cc
@@ -13,6 +13,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "third_party/cros/chromeos_screen_lock.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 class ScreenLockLibraryImpl : public ScreenLockLibrary {
diff --git a/chrome/browser/chromeos/cros/update_library.cc b/chrome/browser/chromeos/cros/update_library.cc
index bc4ec4c..6adae59 100644
--- a/chrome/browser/chromeos/cros/update_library.cc
+++ b/chrome/browser/chromeos/cros/update_library.cc
@@ -12,6 +12,8 @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 class UpdateLibraryImpl : public UpdateLibrary {
diff --git a/chrome/browser/chromeos/customization_document.cc b/chrome/browser/chromeos/customization_document.cc
index 2173f11..27e504d 100644
--- a/chrome/browser/chromeos/customization_document.cc
+++ b/chrome/browser/chromeos/customization_document.cc
@@ -24,6 +24,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/url_fetcher.h"
 
+using content::BrowserThread;
+
 // Manifest attributes names.
 
 namespace {
diff --git a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.cc b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.cc
index 8a68f9d..921cf80 100644
--- a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.cc
+++ b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.cc
@@ -17,6 +17,8 @@
 #include "net/url_request/url_request_context_getter.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 // The ProxyResolverInterface implementation used in production.
diff --git a/chrome/browser/chromeos/dbus/sensors_client.cc b/chrome/browser/chromeos/dbus/sensors_client.cc
index 366f1d9..3eae4ac 100644
--- a/chrome/browser/chromeos/dbus/sensors_client.cc
+++ b/chrome/browser/chromeos/dbus/sensors_client.cc
@@ -13,6 +13,8 @@
 #include "dbus/message.h"
 #include "dbus/object_proxy.h"
 
+using content::BrowserThread;
+
 // TODO(cwolfe): Fix the DEPs so that these can be pulled in from
 //               "chromeos/dbus/service_constants.h".
 namespace chromeos {
diff --git a/chrome/browser/chromeos/enterprise_extension_observer.cc b/chrome/browser/chromeos/enterprise_extension_observer.cc
index 8086952..57342dc 100644
--- a/chrome/browser/chromeos/enterprise_extension_observer.cc
+++ b/chrome/browser/chromeos/enterprise_extension_observer.cc
@@ -13,6 +13,8 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 EnterpriseExtensionObserver::EnterpriseExtensionObserver(Profile* profile)
diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.cc b/chrome/browser/chromeos/extensions/file_browser_event_router.cc
index 7a5be43..b7fbc68 100644
--- a/chrome/browser/chromeos/extensions/file_browser_event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_event_router.cc
@@ -21,6 +21,8 @@
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/file_system_util.h"
 
+using content::BrowserThread;
+
 namespace {
   const char kDiskAddedEventType[] = "added";
   const char kDiskRemovedEventType[] = "removed";
diff --git a/chrome/browser/chromeos/external_metrics.cc b/chrome/browser/chromeos/external_metrics.cc
index 34adc13..f6a792c 100644
--- a/chrome/browser/chromeos/external_metrics.cc
+++ b/chrome/browser/chromeos/external_metrics.cc
@@ -23,6 +23,8 @@
 #include "content/browser/user_metrics.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 // The interval between external metrics collections, in milliseconds.
diff --git a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
index 2236cd6..456fa2e 100644
--- a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
+++ b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
@@ -27,6 +27,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 namespace {
diff --git a/chrome/browser/chromeos/input_method/input_method_manager.cc b/chrome/browser/chromeos/input_method/input_method_manager.cc
index 36344d5..fe7d4c7 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager.cc
+++ b/chrome/browser/chromeos/input_method/input_method_manager.cc
@@ -37,6 +37,8 @@
 #include <X11/X.h>  // ShiftMask, ControlMask, etc.
 #include <X11/Xutil.h>  // for XK_* macros.
 
+using content::BrowserThread;
+
 namespace {
 
 const char kIBusDaemonPath[] = "/usr/bin/ibus-daemon";
diff --git a/chrome/browser/chromeos/input_method/xkeyboard.cc b/chrome/browser/chromeos/input_method/xkeyboard.cc
index ac9297e..aaf89d9 100644
--- a/chrome/browser/chromeos/input_method/xkeyboard.cc
+++ b/chrome/browser/chromeos/input_method/xkeyboard.cc
@@ -25,6 +25,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/x/x11_util.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 namespace input_method {
 namespace {
diff --git a/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc b/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc
index 21f146d..810bfcb 100644
--- a/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc
+++ b/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc
@@ -18,6 +18,8 @@
 
 #include <X11/Xlib.h>
 
+using content::BrowserThread;
+
 #if defined(TOUCH_UI)
 // Since TOUCH_UI build only supports a few keyboard layouts, we skip the tests
 // for now.
diff --git a/chrome/browser/chromeos/login/auth_attempt_state.cc b/chrome/browser/chromeos/login/auth_attempt_state.cc
index bde23f3..e11b7a40 100644
--- a/chrome/browser/chromeos/login/auth_attempt_state.cc
+++ b/chrome/browser/chromeos/login/auth_attempt_state.cc
@@ -11,6 +11,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "third_party/cros/chromeos_cryptohome.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 AuthAttemptState::AuthAttemptState(const std::string& username,
diff --git a/chrome/browser/chromeos/login/camera.cc b/chrome/browser/chromeos/login/camera.cc
index 9c5af6b..742f937 100644
--- a/chrome/browser/chromeos/login/camera.cc
+++ b/chrome/browser/chromeos/login/camera.cc
@@ -32,6 +32,8 @@
 #include "third_party/skia/include/core/SkColorPriv.h"
 #include "ui/gfx/size.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 namespace {
diff --git a/chrome/browser/chromeos/login/camera_detector.cc b/chrome/browser/chromeos/login/camera_detector.cc
index 6d3932f..1ca43ed 100644
--- a/chrome/browser/chromeos/login/camera_detector.cc
+++ b/chrome/browser/chromeos/login/camera_detector.cc
@@ -11,6 +11,8 @@
 #include "chrome/browser/chromeos/system/udev_info_provider.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 namespace {
diff --git a/chrome/browser/chromeos/login/cookie_fetcher_unittest.cc b/chrome/browser/chromeos/login/cookie_fetcher_unittest.cc
index f386fa8..ffda7e5 100644
--- a/chrome/browser/chromeos/login/cookie_fetcher_unittest.cc
+++ b/chrome/browser/chromeos/login/cookie_fetcher_unittest.cc
@@ -19,6 +19,8 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 using ::testing::Return;
 using ::testing::Invoke;
diff --git a/chrome/browser/chromeos/login/cryptohome_op.cc b/chrome/browser/chromeos/login/cryptohome_op.cc
index 86457d4..b2898bc 100644
--- a/chrome/browser/chromeos/login/cryptohome_op.cc
+++ b/chrome/browser/chromeos/login/cryptohome_op.cc
@@ -14,6 +14,8 @@
 #include "chrome/browser/chromeos/login/auth_attempt_state_resolver.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 CryptohomeOp::CryptohomeOp(AuthAttemptState* current_attempt,
diff --git a/chrome/browser/chromeos/login/cryptohome_op_unittest.cc b/chrome/browser/chromeos/login/cryptohome_op_unittest.cc
index 973d5bb..54a4e36 100644
--- a/chrome/browser/chromeos/login/cryptohome_op_unittest.cc
+++ b/chrome/browser/chromeos/login/cryptohome_op_unittest.cc
@@ -17,6 +17,8 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 using ::testing::AnyNumber;
 using ::testing::Invoke;
 using ::testing::Return;
diff --git a/chrome/browser/chromeos/login/google_authenticator.cc b/chrome/browser/chromeos/login/google_authenticator.cc
index 0b5af57..453d5a7 100644
--- a/chrome/browser/chromeos/login/google_authenticator.cc
+++ b/chrome/browser/chromeos/login/google_authenticator.cc
@@ -37,6 +37,7 @@
 
 using base::Time;
 using base::TimeDelta;
+using content::BrowserThread;
 using file_util::GetFileSize;
 using file_util::PathExists;
 using file_util::ReadFile;
diff --git a/chrome/browser/chromeos/login/google_authenticator_unittest.cc b/chrome/browser/chromeos/login/google_authenticator_unittest.cc
index 342a40b..d3efb1f 100644
--- a/chrome/browser/chromeos/login/google_authenticator_unittest.cc
+++ b/chrome/browser/chromeos/login/google_authenticator_unittest.cc
@@ -35,6 +35,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using file_util::CloseFile;
 using file_util::CreateAndOpenTemporaryFile;
 using file_util::CreateAndOpenTemporaryFileInDir;
diff --git a/chrome/browser/chromeos/login/help_app_launcher.cc b/chrome/browser/chromeos/login/help_app_launcher.cc
index ef42eab..b3c95a7 100644
--- a/chrome/browser/chromeos/login/help_app_launcher.cc
+++ b/chrome/browser/chromeos/login/help_app_launcher.cc
@@ -14,6 +14,8 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 namespace {
 
 const char kHelpAppFormat[] =
diff --git a/chrome/browser/chromeos/login/image_decoder.cc b/chrome/browser/chromeos/login/image_decoder.cc
index 3695921..79f94b5 100644
--- a/chrome/browser/chromeos/login/image_decoder.cc
+++ b/chrome/browser/chromeos/login/image_decoder.cc
@@ -9,6 +9,8 @@
 #include "chrome/common/chrome_utility_messages.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 ImageDecoder::ImageDecoder(Delegate* delegate,
diff --git a/chrome/browser/chromeos/login/image_decoder.h b/chrome/browser/chromeos/login/image_decoder.h
index c264b62..c60f248 100644
--- a/chrome/browser/chromeos/login/image_decoder.h
+++ b/chrome/browser/chromeos/login/image_decoder.h
@@ -56,7 +56,7 @@ class ImageDecoder : public UtilityProcessHost::Client {
 
   Delegate* delegate_;
   std::vector<unsigned char> image_data_;
-  BrowserThread::ID target_thread_id_;
+  content::BrowserThread::ID target_thread_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageDecoder);
 };
diff --git a/chrome/browser/chromeos/login/image_downloader.cc b/chrome/browser/chromeos/login/image_downloader.cc
index c8f98ea..60fe41a 100644
--- a/chrome/browser/chromeos/login/image_downloader.cc
+++ b/chrome/browser/chromeos/login/image_downloader.cc
@@ -14,6 +14,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/url_fetcher.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 namespace {
diff --git a/chrome/browser/chromeos/login/login_performer.cc b/chrome/browser/chromeos/login/login_performer.cc
index 6a1671c..0da2fb1 100644
--- a/chrome/browser/chromeos/login/login_performer.cc
+++ b/chrome/browser/chromeos/login/login_performer.cc
@@ -38,6 +38,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 // Initialize default LoginPerformer.
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
index 512189b..e4bd18a 100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -71,6 +71,8 @@
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/gfx/gl/gl_switches.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 namespace {
diff --git a/chrome/browser/chromeos/login/mock_authenticator.cc b/chrome/browser/chromeos/login/mock_authenticator.cc
index 38251a1..94b0517 100644
--- a/chrome/browser/chromeos/login/mock_authenticator.cc
+++ b/chrome/browser/chromeos/login/mock_authenticator.cc
@@ -7,6 +7,8 @@
 #include "base/bind.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 void MockAuthenticator::AuthenticateToLogin(Profile* profile,
diff --git a/chrome/browser/chromeos/login/online_attempt.cc b/chrome/browser/chromeos/login/online_attempt.cc
index 4f34530..1e62b5a 100644
--- a/chrome/browser/chromeos/login/online_attempt.cc
+++ b/chrome/browser/chromeos/login/online_attempt.cc
@@ -23,6 +23,8 @@
 #include "net/url_request/url_request_status.h"
 #include "third_party/libjingle/source/talk/base/urlencode.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // The service scope of the OAuth v2 token that ChromeOS login will be
diff --git a/chrome/browser/chromeos/login/online_attempt_unittest.cc b/chrome/browser/chromeos/login/online_attempt_unittest.cc
index 41155f3..e7debdb 100644
--- a/chrome/browser/chromeos/login/online_attempt_unittest.cc
+++ b/chrome/browser/chromeos/login/online_attempt_unittest.cc
@@ -22,6 +22,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using ::testing::AnyNumber;
 using ::testing::Invoke;
 using ::testing::Return;
diff --git a/chrome/browser/chromeos/login/owner_manager.cc b/chrome/browser/chromeos/login/owner_manager.cc
index b8c4cf0..269bd31 100644
--- a/chrome/browser/chromeos/login/owner_manager.cc
+++ b/chrome/browser/chromeos/login/owner_manager.cc
@@ -17,6 +17,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 OwnerManager::OwnerManager()
diff --git a/chrome/browser/chromeos/login/owner_manager.h b/chrome/browser/chromeos/login/owner_manager.h
index f8eb957..a0e5764 100644
--- a/chrome/browser/chromeos/login/owner_manager.h
+++ b/chrome/browser/chromeos/login/owner_manager.h
@@ -54,7 +54,7 @@ class OwnerManager : public base::RefCountedThreadSafe<OwnerManager> {
   virtual ~OwnerManager();
 
   // Sets a new owner key from a provided memory buffer.
-  void UpdateOwnerKey(const BrowserThread::ID thread_id,
+  void UpdateOwnerKey(const content::BrowserThread::ID thread_id,
                       const std::vector<uint8>& key,
                       KeyUpdateDelegate* d);
 
@@ -73,7 +73,7 @@ class OwnerManager : public base::RefCountedThreadSafe<OwnerManager> {
   // successful return code, passing the signaure blob in |payload|.
   // On failure, calls d->OnKeyOpComplete() on |thread_id| with an appropriate
   // error and passes an empty string for |payload|.
-  void Sign(const BrowserThread::ID thread_id,
+  void Sign(const content::BrowserThread::ID thread_id,
             const std::string& data,
             Delegate* d);
 
@@ -85,7 +85,7 @@ class OwnerManager : public base::RefCountedThreadSafe<OwnerManager> {
   // successful return code, passing an empty string for |payload|.
   // On failure, calls d->OnKeyOpComplete() on |thread_id| with an appropriate
   // error code, passing an empty string for |payload|.
-  void Verify(const BrowserThread::ID thread_id,
+  void Verify(const content::BrowserThread::ID thread_id,
               const std::string& data,
               const std::vector<uint8>& signature,
               Delegate* d);
diff --git a/chrome/browser/chromeos/login/owner_manager_unittest.cc b/chrome/browser/chromeos/login/owner_manager_unittest.cc
index 87ab4e1..2edab2e 100644
--- a/chrome/browser/chromeos/login/owner_manager_unittest.cc
+++ b/chrome/browser/chromeos/login/owner_manager_unittest.cc
@@ -21,6 +21,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using ::crypto::RSAPrivateKey;
 using ::testing::DoAll;
 using ::testing::Eq;
diff --git a/chrome/browser/chromeos/login/ownership_service.cc b/chrome/browser/chromeos/login/ownership_service.cc
index d806674..539aa62 100644
--- a/chrome/browser/chromeos/login/ownership_service.cc
+++ b/chrome/browser/chromeos/login/ownership_service.cc
@@ -15,6 +15,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 static base::LazyInstance<OwnershipService> g_ownership_service(
diff --git a/chrome/browser/chromeos/login/ownership_service.h b/chrome/browser/chromeos/login/ownership_service.h
index b121c5c..52a3d77 100644
--- a/chrome/browser/chromeos/login/ownership_service.h
+++ b/chrome/browser/chromeos/login/ownership_service.h
@@ -117,16 +117,16 @@ class OwnershipService : public content::NotificationObserver {
   void SetStatus(Status new_status);
 
   static void UpdateOwnerKey(OwnershipService* service,
-                             const BrowserThread::ID thread_id,
+                             const content::BrowserThread::ID thread_id,
                              const std::vector<uint8>& new_key,
                              OwnerManager::KeyUpdateDelegate* d);
   static void TryLoadOwnerKeyAttempt(OwnershipService* service);
   static void TrySigningAttempt(OwnershipService* service,
-                                const BrowserThread::ID thread_id,
+                                const content::BrowserThread::ID thread_id,
                                 const std::string& data,
                                 OwnerManager::Delegate* d);
   static void TryVerifyAttempt(OwnershipService* service,
-                               const BrowserThread::ID thread_id,
+                               const content::BrowserThread::ID thread_id,
                                const std::string& data,
                                const std::vector<uint8>& signature,
                                OwnerManager::Delegate* d);
diff --git a/chrome/browser/chromeos/login/ownership_service_unittest.cc b/chrome/browser/chromeos/login/ownership_service_unittest.cc
index b85df01..b15dd80 100644
--- a/chrome/browser/chromeos/login/ownership_service_unittest.cc
+++ b/chrome/browser/chromeos/login/ownership_service_unittest.cc
@@ -20,6 +20,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using ::crypto::RSAPrivateKey;
 using ::testing::DoAll;
 using ::testing::Eq;
diff --git a/chrome/browser/chromeos/login/ownership_status_checker.cc b/chrome/browser/chromeos/login/ownership_status_checker.cc
index f85e1c7..41fb5d0 100644
--- a/chrome/browser/chromeos/login/ownership_status_checker.cc
+++ b/chrome/browser/chromeos/login/ownership_status_checker.cc
@@ -7,6 +7,8 @@
 #include "base/bind.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 OwnershipStatusChecker::OwnershipStatusChecker(const Callback& callback)
diff --git a/chrome/browser/chromeos/login/parallel_authenticator.cc b/chrome/browser/chromeos/login/parallel_authenticator.cc
index 2777353..d68e643 100644
--- a/chrome/browser/chromeos/login/parallel_authenticator.cc
+++ b/chrome/browser/chromeos/login/parallel_authenticator.cc
@@ -43,6 +43,7 @@
 
 using base::Time;
 using base::TimeDelta;
+using content::BrowserThread;
 using file_util::GetFileSize;
 using file_util::PathExists;
 using file_util::ReadFile;
diff --git a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
index d364e42..1c5d4f09 100644
--- a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
+++ b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
@@ -32,6 +32,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using file_util::CloseFile;
 using file_util::CreateAndOpenTemporaryFile;
 using file_util::CreateAndOpenTemporaryFileInDir;
diff --git a/chrome/browser/chromeos/login/profile_image_downloader.cc b/chrome/browser/chromeos/login/profile_image_downloader.cc
index 6a24629..c4dbc9e 100644
--- a/chrome/browser/chromeos/login/profile_image_downloader.cc
+++ b/chrome/browser/chromeos/login/profile_image_downloader.cc
@@ -29,6 +29,8 @@
 #include "googleurl/src/gurl.h"
 #include "skia/ext/image_operations.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 namespace {
diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc
index ca7ee8f..a4479ea 100644
--- a/chrome/browser/chromeos/login/screen_locker.cc
+++ b/chrome/browser/chromeos/login/screen_locker.cc
@@ -49,6 +49,8 @@
 #include "chrome/browser/chromeos/wm_ipc.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 // Observer to start ScreenLocker when the screen lock
diff --git a/chrome/browser/chromeos/login/signed_settings.cc b/chrome/browser/chromeos/login/signed_settings.cc
index 8011b35..8b579ce 100644
--- a/chrome/browser/chromeos/login/signed_settings.cc
+++ b/chrome/browser/chromeos/login/signed_settings.cc
@@ -24,6 +24,7 @@
 #include "content/public/browser/browser_thread.h"
 
 namespace chromeos {
+using content::BrowserThread;
 using google::protobuf::RepeatedPtrField;
 using std::string;
 
diff --git a/chrome/browser/chromeos/login/signed_settings_helper.cc b/chrome/browser/chromeos/login/signed_settings_helper.cc
index f0f53cd..0841b40 100644
--- a/chrome/browser/chromeos/login/signed_settings_helper.cc
+++ b/chrome/browser/chromeos/login/signed_settings_helper.cc
@@ -14,6 +14,8 @@
 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 namespace {
diff --git a/chrome/browser/chromeos/login/signed_settings_helper_unittest.cc b/chrome/browser/chromeos/login/signed_settings_helper_unittest.cc
index f7cc7e1..7f19868 100644
--- a/chrome/browser/chromeos/login/signed_settings_helper_unittest.cc
+++ b/chrome/browser/chromeos/login/signed_settings_helper_unittest.cc
@@ -16,6 +16,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using ::testing::_;
 using ::testing::A;
 using ::testing::AtLeast;
diff --git a/chrome/browser/chromeos/login/signed_settings_temp_storage.cc b/chrome/browser/chromeos/login/signed_settings_temp_storage.cc
index 4182ff9..aa4767e 100644
--- a/chrome/browser/chromeos/login/signed_settings_temp_storage.cc
+++ b/chrome/browser/chromeos/login/signed_settings_temp_storage.cc
@@ -11,6 +11,8 @@
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/common/pref_names.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 // static
diff --git a/chrome/browser/chromeos/login/signed_settings_unittest.cc b/chrome/browser/chromeos/login/signed_settings_unittest.cc
index 1f79d380..7dc197b 100644
--- a/chrome/browser/chromeos/login/signed_settings_unittest.cc
+++ b/chrome/browser/chromeos/login/signed_settings_unittest.cc
@@ -31,6 +31,7 @@ using ::testing::SaveArg;
 using ::testing::StrEq;
 using ::testing::WithArg;
 using ::testing::_;
+using content::BrowserThread;
 using google::protobuf::RepeatedPtrField;
 
 namespace em = enterprise_management;
diff --git a/chrome/browser/chromeos/login/update_screen.cc b/chrome/browser/chromeos/login/update_screen.cc
index 822b6d6..15e3894 100644
--- a/chrome/browser/chromeos/login/update_screen.cc
+++ b/chrome/browser/chromeos/login/update_screen.cc
@@ -13,6 +13,8 @@
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 namespace {
diff --git a/chrome/browser/chromeos/login/user_image_loader.cc b/chrome/browser/chromeos/login/user_image_loader.cc
index 5643da7..95bc3aa 100644
--- a/chrome/browser/chromeos/login/user_image_loader.cc
+++ b/chrome/browser/chromeos/login/user_image_loader.cc
@@ -16,6 +16,8 @@
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/skbitmap_operations.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 UserImageLoader::UserImageLoader(Delegate* delegate)
diff --git a/chrome/browser/chromeos/login/user_manager.cc b/chrome/browser/chromeos/login/user_manager.cc
index 517dd70..bf1ee50 100644
--- a/chrome/browser/chromeos/login/user_manager.cc
+++ b/chrome/browser/chromeos/login/user_manager.cc
@@ -48,6 +48,8 @@
 #include "chrome/browser/chromeos/wm_ipc.h"
 #endif
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 namespace {
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index 38b8c99..40730dd 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -48,6 +48,8 @@
 #include "chrome/app/breakpad_linux.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 // A boolean pref of the EULA accepted flag.
diff --git a/chrome/browser/chromeos/media/media_player.cc b/chrome/browser/chromeos/media/media_player.cc
index fc4529b..7bee1d3 100644
--- a/chrome/browser/chromeos/media/media_player.cc
+++ b/chrome/browser/chromeos/media/media_player.cc
@@ -49,6 +49,8 @@
 #include "chrome/browser/chromeos/frame/panel_browser_view.h"
 #endif
 
+using content::BrowserThread;
+
 static const char* kMediaPlayerAppName = "mediaplayer";
 static const int kPopupLeft = 0;
 static const int kPopupTop = 0;
diff --git a/chrome/browser/chromeos/mobile_config.cc b/chrome/browser/chromeos/mobile_config.cc
index 67a584d..b58ff1b 100644
--- a/chrome/browser/chromeos/mobile_config.cc
+++ b/chrome/browser/chromeos/mobile_config.cc
@@ -16,6 +16,8 @@
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Config attributes names.
diff --git a/chrome/browser/chromeos/net/network_change_notifier_chromeos.cc b/chrome/browser/chromeos/net/network_change_notifier_chromeos.cc
index b2ff758..eb6503b 100644
--- a/chrome/browser/chromeos/net/network_change_notifier_chromeos.cc
+++ b/chrome/browser/chromeos/net/network_change_notifier_chromeos.cc
@@ -8,6 +8,8 @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Delay for online change notification reporting.
diff --git a/chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc b/chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc
index 5e5dd80..68cafc9 100644
--- a/chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc
+++ b/chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc
@@ -10,6 +10,8 @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "content/common/desktop_notification_messages.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 // static
diff --git a/chrome/browser/chromeos/offline/offline_load_page.cc b/chrome/browser/chromeos/offline/offline_load_page.cc
index 51ed11f..1eae409 100644
--- a/chrome/browser/chromeos/offline/offline_load_page.cc
+++ b/chrome/browser/chromeos/offline/offline_load_page.cc
@@ -32,6 +32,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Maximum time to show a blank page.
diff --git a/chrome/browser/chromeos/offline/offline_load_page_unittest.cc b/chrome/browser/chromeos/offline/offline_load_page_unittest.cc
index 2570a48..cfcd7a3 100644
--- a/chrome/browser/chromeos/offline/offline_load_page_unittest.cc
+++ b/chrome/browser/chromeos/offline/offline_load_page_unittest.cc
@@ -11,6 +11,8 @@
 #include "content/common/view_messages.h"
 #include "content/test/test_browser_thread.h"
 
+using content::BrowserThread;
+
 static const char* kURL1 = "http://www.google.com/";
 static const char* kURL2 = "http://www.gmail.com/";
 
diff --git a/chrome/browser/chromeos/proxy_config_service_impl.cc b/chrome/browser/chromeos/proxy_config_service_impl.cc
index 47cd7e1..6aec3c3 100644
--- a/chrome/browser/chromeos/proxy_config_service_impl.cc
+++ b/chrome/browser/chromeos/proxy_config_service_impl.cc
@@ -19,6 +19,8 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 namespace em = enterprise_management;
 
 namespace chromeos {
diff --git a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc
index e3e6385..2b43cb3 100644
--- a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc
+++ b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc
@@ -19,6 +19,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 namespace {
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index 4a36034..ea38941 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -41,6 +41,8 @@
 #include "views/controls/menu/submenu_view.h"
 #include "views/widget/widget.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Offsets for views menu ids (main menu and submenu ids use the same
diff --git a/chrome/browser/chromeos/system/statistics_provider.cc b/chrome/browser/chromeos/system/statistics_provider.cc
index 5c58c6d..c81295c 100644
--- a/chrome/browser/chromeos/system/statistics_provider.cc
+++ b/chrome/browser/chromeos/system/statistics_provider.cc
@@ -16,6 +16,8 @@
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 namespace system {
 namespace {
diff --git a/chrome/browser/chromeos/system/syslogs_provider.cc b/chrome/browser/chromeos/system/syslogs_provider.cc
index 48b8180..07b556f 100644
--- a/chrome/browser/chromeos/system/syslogs_provider.cc
+++ b/chrome/browser/chromeos/system/syslogs_provider.cc
@@ -20,6 +20,8 @@
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 namespace system {
 namespace {
diff --git a/chrome/browser/chromeos/system/timezone_settings.cc b/chrome/browser/chromeos/system/timezone_settings.cc
index 101213b..414463f 100644
--- a/chrome/browser/chromeos/system/timezone_settings.cc
+++ b/chrome/browser/chromeos/system/timezone_settings.cc
@@ -16,6 +16,8 @@
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 namespace system {
 
diff --git a/chrome/browser/chromeos/system/touchpad_settings.cc b/chrome/browser/chromeos/system/touchpad_settings.cc
index 0378a18..157e7a1 100644
--- a/chrome/browser/chromeos/system/touchpad_settings.cc
+++ b/chrome/browser/chromeos/system/touchpad_settings.cc
@@ -14,6 +14,8 @@
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 namespace system {
 namespace touchpad_settings {
diff --git a/chrome/browser/chromeos/system/udev_info_provider.cc b/chrome/browser/chromeos/system/udev_info_provider.cc
index 852f80e..c2f9362b 100644
--- a/chrome/browser/chromeos/system/udev_info_provider.cc
+++ b/chrome/browser/chromeos/system/udev_info_provider.cc
@@ -12,6 +12,8 @@
 #include "chrome/browser/chromeos/system/name_value_pairs_parser.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 namespace system {
 
diff --git a/chrome/browser/chromeos/user_cros_settings_provider.cc b/chrome/browser/chromeos/user_cros_settings_provider.cc
index 084e842..a9786ad 100644
--- a/chrome/browser/chromeos/user_cros_settings_provider.cc
+++ b/chrome/browser/chromeos/user_cros_settings_provider.cc
@@ -32,6 +32,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 namespace {
diff --git a/chrome/browser/chromeos/version_loader.cc b/chrome/browser/chromeos/version_loader.cc
index f4c5671..82d56c0 100644
--- a/chrome/browser/chromeos/version_loader.cc
+++ b/chrome/browser/chromeos/version_loader.cc
@@ -17,6 +17,8 @@
 #include "chrome/browser/browser_process.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 // File to look for version number in.
diff --git a/chrome/browser/chromeos/web_socket_proxy.cc b/chrome/browser/chromeos/web_socket_proxy.cc
index ef1d42c..2d250a0 100644
--- a/chrome/browser/chromeos/web_socket_proxy.cc
+++ b/chrome/browser/chromeos/web_socket_proxy.cc
@@ -56,6 +56,8 @@
 #include "third_party/libevent/evdns.h"
 #include "third_party/libevent/event.h"
 
+using content::BrowserThread;
+
 namespace chromeos {
 
 namespace {
diff --git a/chrome/browser/chromeos/web_socket_proxy_controller.cc b/chrome/browser/chromeos/web_socket_proxy_controller.cc
index e8cd4ae..9a494e3 100644
--- a/chrome/browser/chromeos/web_socket_proxy_controller.cc
+++ b/chrome/browser/chromeos/web_socket_proxy_controller.cc
@@ -29,6 +29,8 @@
 #include "googleurl/src/gurl.h"
 #include "net/base/network_change_notifier.h"
 
+using content::BrowserThread;
+
 namespace {
 
 const char* kAllowedIds[] = {
diff --git a/chrome/browser/component_updater/component_installers_unittest.cc b/chrome/browser/component_updater/component_installers_unittest.cc
index 95fe7aa..18bac80 100644
--- a/chrome/browser/component_updater/component_installers_unittest.cc
+++ b/chrome/browser/component_updater/component_installers_unittest.cc
@@ -16,6 +16,8 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace {
 // File name of the Pepper Flash plugin on different platforms.
 const FilePath::CharType kDataPath[] =
diff --git a/chrome/browser/component_updater/component_updater_interceptor.cc b/chrome/browser/component_updater/component_updater_interceptor.cc
index b7728c8..afd7b0d 100644
--- a/chrome/browser/component_updater/component_updater_interceptor.cc
+++ b/chrome/browser/component_updater/component_updater_interceptor.cc
@@ -9,6 +9,8 @@
 #include "net/url_request/url_request_test_job.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 ComponentUpdateInterceptor::ComponentUpdateInterceptor()
   : hit_count_(0) {
   net::URLRequest::Deprecated::RegisterRequestInterceptor(this);
diff --git a/chrome/browser/component_updater/component_updater_service.cc b/chrome/browser/component_updater/component_updater_service.cc
index 63daf1f..c48b90f 100644
--- a/chrome/browser/component_updater/component_updater_service.cc
+++ b/chrome/browser/component_updater/component_updater_service.cc
@@ -31,6 +31,8 @@
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 
+using content::BrowserThread;
+
 namespace {
 // Extends an omaha compatible update check url |query| string. Does
 // not mutate the string if it would be longer than |limit| chars.
diff --git a/chrome/browser/component_updater/component_updater_service_unittest.cc b/chrome/browser/component_updater/component_updater_service_unittest.cc
index 26a08d0..3bbac3d 100644
--- a/chrome/browser/component_updater/component_updater_service_unittest.cc
+++ b/chrome/browser/component_updater/component_updater_service_unittest.cc
@@ -24,6 +24,8 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace {
 // Overrides some of the component updater behaviors so it is easier to test
 // and loops faster. In actual usage it takes hours do to a full cycle.
diff --git a/chrome/browser/component_updater/npapi_flash_component_installer.cc b/chrome/browser/component_updater/npapi_flash_component_installer.cc
index 997b008..86c68a6 100644
--- a/chrome/browser/component_updater/npapi_flash_component_installer.cc
+++ b/chrome/browser/component_updater/npapi_flash_component_installer.cc
@@ -21,6 +21,8 @@
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/webplugininfo.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // CRX hash. The extension id is: immdilkhigodmjbnngapbehchmihabbg.
diff --git a/chrome/browser/component_updater/pepper_flash_component_installer.cc b/chrome/browser/component_updater/pepper_flash_component_installer.cc
index e2b17aa..0cb8e5f 100644
--- a/chrome/browser/component_updater/pepper_flash_component_installer.cc
+++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc
@@ -27,6 +27,8 @@
 #include "webkit/plugins/plugin_constants.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // CRX hash. The extension id is: mimojjlkmoijpicakmndhoigimigcmbb.
diff --git a/chrome/browser/component_updater/recovery_component_installer.cc b/chrome/browser/component_updater/recovery_component_installer.cc
index ec53032..ae265e7 100644
--- a/chrome/browser/component_updater/recovery_component_installer.cc
+++ b/chrome/browser/component_updater/recovery_component_installer.cc
@@ -21,6 +21,8 @@
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // CRX hash. The extension id is: npdjjkjlcidkjlamlmmdelcjbcpdjocm.
diff --git a/chrome/browser/content_settings/content_settings_default_provider.cc b/chrome/browser/content_settings/content_settings_default_provider.cc
index 02d702a..d1ff977 100644
--- a/chrome/browser/content_settings/content_settings_default_provider.cc
+++ b/chrome/browser/content_settings/content_settings_default_provider.cc
@@ -24,6 +24,8 @@
 #include "content/public/browser/notification_source.h"
 #include "googleurl/src/gurl.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // The default setting for each content type.
diff --git a/chrome/browser/content_settings/content_settings_default_provider_unittest.cc b/chrome/browser/content_settings/content_settings_default_provider_unittest.cc
index 13594a16..21f0ff7 100644
--- a/chrome/browser/content_settings/content_settings_default_provider_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_default_provider_unittest.cc
@@ -15,6 +15,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
+using content::BrowserThread;
 
 class DefaultProviderTest : public testing::Test {
  public:
diff --git a/chrome/browser/content_settings/content_settings_policy_provider.cc b/chrome/browser/content_settings/content_settings_policy_provider.cc
index 4c57b89..f1e17c2 100644
--- a/chrome/browser/content_settings/content_settings_policy_provider.cc
+++ b/chrome/browser/content_settings/content_settings_policy_provider.cc
@@ -19,6 +19,8 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // The preferences used to manage ContentSettingsTypes.
diff --git a/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc b/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc
index c08d833..af38ccb 100644
--- a/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc
@@ -23,6 +23,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
+using content::BrowserThread;
 
 namespace content_settings {
 
diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc
index 0ede36f..cc6cf8b 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider.cc
+++ b/chrome/browser/content_settings/content_settings_pref_provider.cc
@@ -27,6 +27,8 @@
 #include "content/public/browser/notification_source.h"
 #include "googleurl/src/gurl.h"
 
+using content::BrowserThread;
+
 namespace {
 
 typedef std::pair<std::string, std::string> StringPair;
diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
index efd47f69..50e56ff 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
@@ -30,6 +30,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
+using content::BrowserThread;
 
 namespace {
 
diff --git a/chrome/browser/content_settings/cookie_settings.cc b/chrome/browser/content_settings/cookie_settings.cc
index da8614f..dd5d788 100644
--- a/chrome/browser/content_settings/cookie_settings.cc
+++ b/chrome/browser/content_settings/cookie_settings.cc
@@ -23,6 +23,8 @@
 #include "net/base/net_errors.h"
 #include "net/base/static_cookie_policy.h"
 
+using content::BrowserThread;
+
 namespace {
 
 bool IsValidSetting(ContentSetting setting) {
diff --git a/chrome/browser/content_settings/cookie_settings_unittest.cc b/chrome/browser/content_settings/cookie_settings_unittest.cc
index 25d164e..8fc783b 100644
--- a/chrome/browser/content_settings/cookie_settings_unittest.cc
+++ b/chrome/browser/content_settings/cookie_settings_unittest.cc
@@ -15,6 +15,8 @@
 #include "net/base/static_cookie_policy.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace {
 
 class CookieSettingsTest : public testing::Test {
diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc
index ebf157e..3b4d4db3 100644
--- a/chrome/browser/content_settings/host_content_settings_map.cc
+++ b/chrome/browser/content_settings/host_content_settings_map.cc
@@ -35,6 +35,8 @@
 #include "net/base/net_errors.h"
 #include "net/base/static_cookie_policy.h"
 
+using content::BrowserThread;
+
 namespace {
 
 typedef std::vector<content_settings::Rule> Rules;
diff --git a/chrome/browser/content_settings/host_content_settings_map_unittest.cc b/chrome/browser/content_settings/host_content_settings_map_unittest.cc
index 099d53d..aff5b58 100644
--- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc
+++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc
@@ -22,6 +22,8 @@
 #include "net/base/static_cookie_policy.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 using ::testing::_;
 
 namespace {
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc
index 5a56797..4e1669b 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings.cc
+++ b/chrome/browser/content_settings/tab_specific_content_settings.cc
@@ -31,6 +31,8 @@
 #include "content/common/view_messages.h"
 #include "webkit/fileapi/file_system_types.h"
 
+using content::BrowserThread;
+
 namespace {
 typedef std::list<TabSpecificContentSettings*> TabSpecificList;
 static base::LazyInstance<TabSpecificList> g_tab_specific(
diff --git a/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc b/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc
index 7182ef9..749ece9 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc
+++ b/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc
@@ -10,6 +10,8 @@
 #include "net/base/cookie_monster.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 class TabSpecificContentSettingsTest : public ChromeRenderViewHostTestHarness {
  public:
   TabSpecificContentSettingsTest()
diff --git a/chrome/browser/cookies_tree_model_unittest.cc b/chrome/browser/cookies_tree_model_unittest.cc
index 0bb72ce..794c6a9 100644
--- a/chrome/browser/cookies_tree_model_unittest.cc
+++ b/chrome/browser/cookies_tree_model_unittest.cc
@@ -27,6 +27,7 @@
 #include "base/utf_string_conversions.h"
 
 using ::testing::_;
+using content::BrowserThread;
 
 namespace {
 
diff --git a/chrome/browser/crash_handler_host_linux.cc b/chrome/browser/crash_handler_host_linux.cc
index c1c4b5c..d3e63fe 100644
--- a/chrome/browser/crash_handler_host_linux.cc
+++ b/chrome/browser/crash_handler_host_linux.cc
@@ -31,6 +31,7 @@
 #include "chrome/common/env_vars.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
 using google_breakpad::ExceptionHandler;
 
 namespace {
diff --git a/chrome/browser/crash_upload_list.cc b/chrome/browser/crash_upload_list.cc
index 2c80d3a..0200ad9 100644
--- a/chrome/browser/crash_upload_list.cc
+++ b/chrome/browser/crash_upload_list.cc
@@ -17,6 +17,8 @@
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 CrashUploadList::CrashInfo::CrashInfo(const std::string& c, const base::Time& t)
     : crash_id(c), crash_time(t) {}
 
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.cc b/chrome/browser/custom_handlers/protocol_handler_registry.cc
index dde6e71..c9a727e 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry.cc
+++ b/chrome/browser/custom_handlers/protocol_handler_registry.cc
@@ -23,6 +23,8 @@
 #include "net/base/network_delegate.h"
 #include "net/url_request/url_request_redirect_job.h"
 
+using content::BrowserThread;
+
 // ProtocolHandlerRegistry -----------------------------------------------------
 
 ProtocolHandlerRegistry::ProtocolHandlerRegistry(Profile* profile,
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.h b/chrome/browser/custom_handlers/protocol_handler_registry.h
index 029801e..98d3e02d 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry.h
+++ b/chrome/browser/custom_handlers/protocol_handler_registry.h
@@ -28,8 +28,8 @@
 // instances of this class.
 
 class ProtocolHandlerRegistry
-    : public base::RefCountedThreadSafe<ProtocolHandlerRegistry,
-                                        BrowserThread::DeleteOnIOThread> {
+    : public base::RefCountedThreadSafe<
+          ProtocolHandlerRegistry, content::BrowserThread::DeleteOnIOThread> {
  public:
   class DefaultClientObserver
       : public ShellIntegration::DefaultWebClientObserver {
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
index 168c463..72eac2a 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
+++ b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
@@ -23,6 +23,8 @@
 #include "content/test/test_browser_thread.h"
 #include "net/url_request/url_request.h"
 
+using content::BrowserThread;
+
 namespace {
 
 class FakeDelegate : public ProtocolHandlerRegistry::Delegate {
diff --git a/chrome/browser/debugger/devtools_file_util.cc b/chrome/browser/debugger/devtools_file_util.cc
index d436117..b7b1cbd 100644
--- a/chrome/browser/debugger/devtools_file_util.cc
+++ b/chrome/browser/debugger/devtools_file_util.cc
@@ -12,6 +12,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/shell_dialogs.h"
 
+using content::BrowserThread;
+
 namespace {
 
 class SaveAsDialog : public SelectFileDialog::Listener,
diff --git a/chrome/browser/debugger/devtools_protocol_handler.cc b/chrome/browser/debugger/devtools_protocol_handler.cc
index 65ec12a..af94902 100644
--- a/chrome/browser/debugger/devtools_protocol_handler.cc
+++ b/chrome/browser/debugger/devtools_protocol_handler.cc
@@ -14,6 +14,8 @@
 #include "chrome/browser/debugger/inspectable_tab_proxy.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 // static
 scoped_refptr<DevToolsProtocolHandler> DevToolsProtocolHandler::Start(
     int port) {
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc
index ecbcb5a..87dca28 100644
--- a/chrome/browser/debugger/devtools_sanity_unittest.cc
+++ b/chrome/browser/debugger/devtools_sanity_unittest.cc
@@ -32,6 +32,8 @@
 #include "content/public/browser/notification_service.h"
 #include "net/test/test_server.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Used to block until a dev tools client window's browser is closed.
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
index f0145e0..deaa40c 100644
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -40,6 +40,8 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 ChromeDownloadManagerDelegate::ChromeDownloadManagerDelegate(Profile* profile)
     : profile_(profile),
       download_prefs_(new DownloadPrefs(profile->GetPrefs())) {
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index 8668631..d1876eb 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -52,6 +52,8 @@
 #include "net/base/net_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // IDs and paths of CRX files used in tests.
diff --git a/chrome/browser/download/download_crx_util.cc b/chrome/browser/download/download_crx_util.cc
index 9d99597..23f54ca 100644
--- a/chrome/browser/download/download_crx_util.cc
+++ b/chrome/browser/download/download_crx_util.cc
@@ -13,6 +13,8 @@
 #include "content/browser/download/download_item.h"
 #include "content/public/browser/notification_service.h"
 
+using content::BrowserThread;
+
 namespace download_crx_util {
 
 namespace {
diff --git a/chrome/browser/download/download_manager_unittest.cc b/chrome/browser/download/download_manager_unittest.cc
index 3d3c0cbc..a85fb3e 100644
--- a/chrome/browser/download/download_manager_unittest.cc
+++ b/chrome/browser/download/download_manager_unittest.cc
@@ -43,6 +43,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/text/bytes_formatting.h"
 
+using content::BrowserThread;
+
 DownloadId::Domain kValidIdDomain = "valid DownloadId::Domain";
 
 class DownloadManagerTest : public testing::Test {
diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc
index 0dc6058..feced8d 100644
--- a/chrome/browser/download/download_prefs.cc
+++ b/chrome/browser/download/download_prefs.cc
@@ -21,6 +21,8 @@
 #include "content/browser/download/save_package.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 DownloadPrefs::DownloadPrefs(PrefService* prefs) : prefs_(prefs) {
   prompt_for_download_.Init(prefs::kPromptForDownload, prefs, NULL);
   download_path_.Init(prefs::kDownloadDefaultDirectory, prefs, NULL);
diff --git a/chrome/browser/download/download_request_limiter.cc b/chrome/browser/download/download_request_limiter.cc
index a37a23d..8f950e89 100644
--- a/chrome/browser/download/download_request_limiter.cc
+++ b/chrome/browser/download/download_request_limiter.cc
@@ -20,6 +20,8 @@
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 
+using content::BrowserThread;
+
 // TabDownloadState ------------------------------------------------------------
 
 DownloadRequestLimiter::TabDownloadState::TabDownloadState(
diff --git a/chrome/browser/download/download_request_limiter_unittest.cc b/chrome/browser/download/download_request_limiter_unittest.cc
index d88fb94..e4e6463 100644
--- a/chrome/browser/download/download_request_limiter_unittest.cc
+++ b/chrome/browser/download/download_request_limiter_unittest.cc
@@ -10,6 +10,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 class DownloadRequestLimiterTest
     : public TabContentsWrapperTestHarness,
       public DownloadRequestLimiter::Callback {
diff --git a/chrome/browser/download/download_safe_browsing_client.cc b/chrome/browser/download/download_safe_browsing_client.cc
index c9a45e6..027d005 100644
--- a/chrome/browser/download/download_safe_browsing_client.cc
+++ b/chrome/browser/download/download_safe_browsing_client.cc
@@ -19,6 +19,8 @@
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 // TODO(lzheng): Get rid of the AddRef and Release after
 // SafeBrowsingService::Client is changed to RefCountedThreadSafe<>.
 
diff --git a/chrome/browser/download/download_safe_browsing_client_unittest.cc b/chrome/browser/download/download_safe_browsing_client_unittest.cc
index b8ae9944..9dc47e3 100644
--- a/chrome/browser/download/download_safe_browsing_client_unittest.cc
+++ b/chrome/browser/download/download_safe_browsing_client_unittest.cc
@@ -9,6 +9,8 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace {
 
 const char* kUrl1 = "http://127.0.0.1/";
diff --git a/chrome/browser/download/download_test_observer.cc b/chrome/browser/download/download_test_observer.cc
index 48d8367..c60f374 100644
--- a/chrome/browser/download/download_test_observer.cc
+++ b/chrome/browser/download/download_test_observer.cc
@@ -12,6 +12,8 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 // These functions take scoped_refptr's to DownloadManager because they
 // are posted to message queues, and hence may execute arbitrarily after
 // their actual posting.  Once posted, there is no connection between
diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc
index c77f9ad..d5cd33e 100644
--- a/chrome/browser/download/save_page_browsertest.cc
+++ b/chrome/browser/download/save_page_browsertest.cc
@@ -31,6 +31,8 @@
 #include "content/public/browser/notification_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace {
 
 static const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("save_page");
diff --git a/chrome/browser/enumerate_modules_model_win.cc b/chrome/browser/enumerate_modules_model_win.cc
index 12f0227..9d9488a 100644
--- a/chrome/browser/enumerate_modules_model_win.cc
+++ b/chrome/browser/enumerate_modules_model_win.cc
@@ -30,6 +30,8 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 // The period of time (in milliseconds) to wait until checking to see if any
 // incompatible modules exist.
 static const int kModuleCheckDelayMs = 60 * 1000;
diff --git a/chrome/browser/enumerate_modules_model_win.h b/chrome/browser/enumerate_modules_model_win.h
index 67b0b47..e970930 100644
--- a/chrome/browser/enumerate_modules_model_win.h
+++ b/chrome/browser/enumerate_modules_model_win.h
@@ -212,7 +212,7 @@ class ModuleEnumerator : public base::RefCountedThreadSafe<ModuleEnumerator> {
   bool limited_mode_;
 
   // The thread that we need to call back on to report that we are done.
-  BrowserThread::ID callback_thread_id_;
+  content::BrowserThread::ID callback_thread_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ModuleEnumerator);
 };
diff --git a/chrome/browser/errorpage_browsertest.cc b/chrome/browser/errorpage_browsertest.cc
index 9d3b004b..a1cc91b 100644
--- a/chrome/browser/errorpage_browsertest.cc
+++ b/chrome/browser/errorpage_browsertest.cc
@@ -13,6 +13,8 @@
 #include "content/browser/net/url_request_failed_dns_job.h"
 #include "content/browser/net/url_request_mock_http_job.h"
 
+using content::BrowserThread;
+
 class ErrorPageTest : public InProcessBrowserTest {
  public:
   enum HistoryNavigationDirection {
diff --git a/chrome/browser/extensions/app_notification_manager.cc b/chrome/browser/extensions/app_notification_manager.cc
index 87fd206..57ee90a 100644
--- a/chrome/browser/extensions/app_notification_manager.cc
+++ b/chrome/browser/extensions/app_notification_manager.cc
@@ -16,6 +16,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 
+using content::BrowserThread;
+
 typedef std::map<std::string, SyncData> SyncDataMap;
 
 namespace {
diff --git a/chrome/browser/extensions/app_notification_manager_sync_unittest.cc b/chrome/browser/extensions/app_notification_manager_sync_unittest.cc
index 97beebe..2b6f4f2 100644
--- a/chrome/browser/extensions/app_notification_manager_sync_unittest.cc
+++ b/chrome/browser/extensions/app_notification_manager_sync_unittest.cc
@@ -12,6 +12,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Extract notification guid from SyncData.
diff --git a/chrome/browser/extensions/app_notification_manager_unittest.cc b/chrome/browser/extensions/app_notification_manager_unittest.cc
index f3d588a..c536f46 100644
--- a/chrome/browser/extensions/app_notification_manager_unittest.cc
+++ b/chrome/browser/extensions/app_notification_manager_unittest.cc
@@ -15,6 +15,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace util = app_notification_test_util;
 
 class AppNotificationManagerTest : public testing::Test {
diff --git a/chrome/browser/extensions/app_notification_storage.cc b/chrome/browser/extensions/app_notification_storage.cc
index f97ed4f..2c8f594 100644
--- a/chrome/browser/extensions/app_notification_storage.cc
+++ b/chrome/browser/extensions/app_notification_storage.cc
@@ -18,6 +18,7 @@
 
 using base::JSONReader;
 using base::JSONWriter;
+using content::BrowserThread;
 
 // A concrete implementation of the AppNotificationStorage interface, using
 // LevelDb for backing storage.
diff --git a/chrome/browser/extensions/app_notification_storage_unittest.cc b/chrome/browser/extensions/app_notification_storage_unittest.cc
index ef4ab85..f9735c5 100644
--- a/chrome/browser/extensions/app_notification_storage_unittest.cc
+++ b/chrome/browser/extensions/app_notification_storage_unittest.cc
@@ -15,6 +15,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace util = app_notification_test_util;
 
 class AppNotificationStorageTest : public testing::Test {
diff --git a/chrome/browser/extensions/app_notify_channel_setup.cc b/chrome/browser/extensions/app_notify_channel_setup.cc
index e990e1a1..c0ec84f 100644
--- a/chrome/browser/extensions/app_notify_channel_setup.cc
+++ b/chrome/browser/extensions/app_notify_channel_setup.cc
@@ -15,6 +15,8 @@
 #include "net/base/escape.h"
 #include "net/url_request/url_request_status.h"
 
+using content::BrowserThread;
+
 AppNotifyChannelSetup::AppNotifyChannelSetup(
     Profile* profile,
     const std::string& client_id,
diff --git a/chrome/browser/extensions/app_notify_channel_setup_unittest.cc b/chrome/browser/extensions/app_notify_channel_setup_unittest.cc
index 42c8ac0..8908cec 100644
--- a/chrome/browser/extensions/app_notify_channel_setup_unittest.cc
+++ b/chrome/browser/extensions/app_notify_channel_setup_unittest.cc
@@ -17,6 +17,8 @@
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace {
 
 const int kRouteId = 4;
diff --git a/chrome/browser/extensions/autoupdate_interceptor.cc b/chrome/browser/extensions/autoupdate_interceptor.cc
index 545cd77..50beca4 100644
--- a/chrome/browser/extensions/autoupdate_interceptor.cc
+++ b/chrome/browser/extensions/autoupdate_interceptor.cc
@@ -11,6 +11,8 @@
 #include "net/url_request/url_request_test_job.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 // This is a specialized version of net::URLRequestTestJob that lets us specify
 // response data and make sure the response code is 200, which the autoupdate
 // code relies on.
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc
index 1f4e053..2700002 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -42,6 +42,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+using content::BrowserThread;
+
 namespace {
 
 struct Whitelist {
diff --git a/chrome/browser/extensions/execute_code_in_tab_function.cc b/chrome/browser/extensions/execute_code_in_tab_function.cc
index f71b869..b58ac5c 100644
--- a/chrome/browser/extensions/execute_code_in_tab_function.cc
+++ b/chrome/browser/extensions/execute_code_in_tab_function.cc
@@ -25,6 +25,8 @@
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 
+using content::BrowserThread;
+
 namespace keys = extension_tabs_module_constants;
 
 ExecuteCodeInTabFunction::ExecuteCodeInTabFunction()
diff --git a/chrome/browser/extensions/extension_clear_api.cc b/chrome/browser/extensions/extension_clear_api.cc
index 91f6c1f..9b10b21 100644
--- a/chrome/browser/extensions/extension_clear_api.cc
+++ b/chrome/browser/extensions/extension_clear_api.cc
@@ -22,6 +22,8 @@
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace keys = extension_clear_api_constants;
 
 namespace {
diff --git a/chrome/browser/extensions/extension_content_settings_api.cc b/chrome/browser/extensions/extension_content_settings_api.cc
index f6a76bd..eb819f4 100644
--- a/chrome/browser/extensions/extension_content_settings_api.cc
+++ b/chrome/browser/extensions/extension_content_settings_api.cc
@@ -23,6 +23,8 @@
 #include "content/browser/plugin_service.h"
 #include "webkit/plugins/npapi/plugin_group.h"
 
+using content::BrowserThread;
+
 namespace helpers = extension_content_settings_helpers;
 namespace keys = extension_content_settings_api_constants;
 namespace pref_helpers = extension_preference_helpers;
diff --git a/chrome/browser/extensions/extension_content_settings_store.cc b/chrome/browser/extensions/extension_content_settings_store.cc
index 2677d95a..14713a1 100644
--- a/chrome/browser/extensions/extension_content_settings_store.cc
+++ b/chrome/browser/extensions/extension_content_settings_store.cc
@@ -21,6 +21,7 @@
 namespace helpers = extension_content_settings_helpers;
 namespace keys = extension_content_settings_api_constants;
 
+using content::BrowserThread;
 using content_settings::ConcatenationIterator;
 using content_settings::Rule;
 using content_settings::RuleIterator;
diff --git a/chrome/browser/extensions/extension_cookies_api.cc b/chrome/browser/extensions/extension_cookies_api.cc
index 76d5ed8..596278e 100644
--- a/chrome/browser/extensions/extension_cookies_api.cc
+++ b/chrome/browser/extensions/extension_cookies_api.cc
@@ -24,6 +24,8 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
+using content::BrowserThread;
+
 namespace keys = extension_cookies_api_constants;
 
 ExtensionCookiesEventRouter::ExtensionCookiesEventRouter(Profile* profile)
diff --git a/chrome/browser/extensions/extension_data_deleter.cc b/chrome/browser/extensions/extension_data_deleter.cc
index 968ebfb..fc24fe0 100644
--- a/chrome/browser/extensions/extension_data_deleter.cc
+++ b/chrome/browser/extensions/extension_data_deleter.cc
@@ -22,6 +22,8 @@
 #include "webkit/database/database_util.h"
 #include "webkit/fileapi/file_system_context.h"
 
+using content::BrowserThread;
+
 /* static */
 void ExtensionDataDeleter::StartDeleting(
     Profile* profile,
diff --git a/chrome/browser/extensions/extension_data_deleter.h b/chrome/browser/extensions/extension_data_deleter.h
index a08090a..0aec12a 100644
--- a/chrome/browser/extensions/extension_data_deleter.h
+++ b/chrome/browser/extensions/extension_data_deleter.h
@@ -32,8 +32,8 @@ class WebKitContext;
 // cookies for a given extension. This is used by
 // ExtensionService::ClearExtensionData() upon uninstalling an extension.
 class ExtensionDataDeleter
-  : public base::RefCountedThreadSafe<ExtensionDataDeleter,
-                                      BrowserThread::DeleteOnUIThread> {
+  : public base::RefCountedThreadSafe<
+        ExtensionDataDeleter, content::BrowserThread::DeleteOnUIThread> {
  public:
   // Starts removing data. The extension should not be running when this is
   // called. Cookies are deleted on the current thread, local storage and
@@ -46,7 +46,8 @@ class ExtensionDataDeleter
       bool is_storage_isolated);
 
  private:
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
+  friend struct content::BrowserThread::DeleteOnThread<
+      content::BrowserThread::UI>;
   friend class DeleteTask<ExtensionDataDeleter>;
 
   ExtensionDataDeleter(
diff --git a/chrome/browser/extensions/extension_downloads_api.cc b/chrome/browser/extensions/extension_downloads_api.cc
index fc98dbd..8e4657f 100644
--- a/chrome/browser/extensions/extension_downloads_api.cc
+++ b/chrome/browser/extensions/extension_downloads_api.cc
@@ -41,6 +41,8 @@
 #include "net/http/http_util.h"
 #include "net/url_request/url_request.h"
 
+using content::BrowserThread;
+
 namespace constants = extension_downloads_api_constants;
 
 bool DownloadsFunctionInterface::RunImplImpl(
diff --git a/chrome/browser/extensions/extension_event_router.cc b/chrome/browser/extensions/extension_event_router.cc
index 8611daf..963477f 100644
--- a/chrome/browser/extensions/extension_event_router.cc
+++ b/chrome/browser/extensions/extension_event_router.cc
@@ -23,6 +23,8 @@
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/public/browser/notification_service.h"
 
+using content::BrowserThread;
+
 namespace {
 
 const char kDispatchEvent[] = "Event.dispatchJSON";
diff --git a/chrome/browser/extensions/extension_event_router_forwarder.cc b/chrome/browser/extensions/extension_event_router_forwarder.cc
index f564847..48155ac 100644
--- a/chrome/browser/extensions/extension_event_router_forwarder.cc
+++ b/chrome/browser/extensions/extension_event_router_forwarder.cc
@@ -9,6 +9,8 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "googleurl/src/gurl.h"
 
+using content::BrowserThread;
+
 ExtensionEventRouterForwarder::ExtensionEventRouterForwarder() {
 }
 
diff --git a/chrome/browser/extensions/extension_event_router_forwarder_unittest.cc b/chrome/browser/extensions/extension_event_router_forwarder_unittest.cc
index 143d27c..7ff7a99 100644
--- a/chrome/browser/extensions/extension_event_router_forwarder_unittest.cc
+++ b/chrome/browser/extensions/extension_event_router_forwarder_unittest.cc
@@ -17,6 +17,8 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace {
 
 const char kEventName[] = "event_name";
diff --git a/chrome/browser/extensions/extension_file_browser_private_api.cc b/chrome/browser/extensions/extension_file_browser_private_api.cc
index 0e8eb11..f0af322 100644
--- a/chrome/browser/extensions/extension_file_browser_private_api.cc
+++ b/chrome/browser/extensions/extension_file_browser_private_api.cc
@@ -53,6 +53,8 @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #endif
 
+using content::BrowserThread;
+
 // Error messages.
 const char kFileError[] = "File error %d";
 const char kInvalidFileUrl[] = "Invalid file URL";
diff --git a/chrome/browser/extensions/extension_function.cc b/chrome/browser/extensions/extension_function.cc
index 2983007..28d6407 100644
--- a/chrome/browser/extensions/extension_function.cc
+++ b/chrome/browser/extensions/extension_function.cc
@@ -18,6 +18,8 @@
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/result_codes.h"
 
+using content::BrowserThread;
+
 // static
 void ExtensionFunctionDeleteTraits::Destruct(const ExtensionFunction* x) {
   x->Destruct();
diff --git a/chrome/browser/extensions/extension_function.h b/chrome/browser/extensions/extension_function.h
index 3ab5139..7e3cd3a 100644
--- a/chrome/browser/extensions/extension_function.h
+++ b/chrome/browser/extensions/extension_function.h
@@ -225,7 +225,8 @@ class UIThreadExtensionFunction : public ExtensionFunction {
   }
 
  protected:
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
+  friend struct content::BrowserThread::DeleteOnThread<
+      content::BrowserThread::UI>;
   friend class DeleteTask<UIThreadExtensionFunction>;
 
   virtual ~UIThreadExtensionFunction();
@@ -314,7 +315,8 @@ class IOThreadExtensionFunction : public ExtensionFunction {
   }
 
  protected:
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::IO>;
+  friend struct content::BrowserThread::DeleteOnThread<
+      content::BrowserThread::IO>;
   friend class DeleteTask<IOThreadExtensionFunction>;
 
   virtual ~IOThreadExtensionFunction();
diff --git a/chrome/browser/extensions/extension_icon_manager_unittest.cc b/chrome/browser/extensions/extension_icon_manager_unittest.cc
index 4d1de40..2a47c40 100644
--- a/chrome/browser/extensions/extension_icon_manager_unittest.cc
+++ b/chrome/browser/extensions/extension_icon_manager_unittest.cc
@@ -14,6 +14,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/skia_util.h"
 
+using content::BrowserThread;
+
 // Our test class that takes care of managing the necessary threads for loading
 // extension icons, and waiting for those loads to happen.
 class ExtensionIconManagerTest : public testing::Test {
diff --git a/chrome/browser/extensions/extension_info_map.cc b/chrome/browser/extensions/extension_info_map.cc
index 401c72d..d2126c5 100644
--- a/chrome/browser/extensions/extension_info_map.cc
+++ b/chrome/browser/extensions/extension_info_map.cc
@@ -7,6 +7,8 @@
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace {
 
 void CheckOnValidThread() {
diff --git a/chrome/browser/extensions/extension_info_map_unittest.cc b/chrome/browser/extensions/extension_info_map_unittest.cc
index b382ff7..c6690d2 100644
--- a/chrome/browser/extensions/extension_info_map_unittest.cc
+++ b/chrome/browser/extensions/extension_info_map_unittest.cc
@@ -11,6 +11,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace keys = extension_manifest_keys;
 
 namespace {
diff --git a/chrome/browser/extensions/extension_management_api.cc b/chrome/browser/extensions/extension_management_api.cc
index fdf215b..912f726 100644
--- a/chrome/browser/extensions/extension_management_api.cc
+++ b/chrome/browser/extensions/extension_management_api.cc
@@ -31,6 +31,7 @@
 #include "content/public/browser/notification_source.h"
 
 using base::IntToString;
+using content::BrowserThread;
 namespace events = extension_event_names;
 
 namespace {
diff --git a/chrome/browser/extensions/extension_menu_manager_unittest.cc b/chrome/browser/extensions/extension_menu_manager_unittest.cc
index 576e08cc9..fa92284 100644
--- a/chrome/browser/extensions/extension_menu_manager_unittest.cc
+++ b/chrome/browser/extensions/extension_menu_manager_unittest.cc
@@ -24,6 +24,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/context_menu.h"
 
+using content::BrowserThread;
 using testing::_;
 using testing::AtLeast;
 using testing::Return;
diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc
index 31f5bf1..3d937d8 100644
--- a/chrome/browser/extensions/extension_prefs_unittest.cc
+++ b/chrome/browser/extensions/extension_prefs_unittest.cc
@@ -23,6 +23,7 @@
 
 using base::Time;
 using base::TimeDelta;
+using content::BrowserThread;
 
 namespace {
 
diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc
index 487a908e..b79a35e 100644
--- a/chrome/browser/extensions/extension_process_manager.cc
+++ b/chrome/browser/extensions/extension_process_manager.cc
@@ -28,6 +28,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Incognito profiles use this process manager. It is mostly a shim that decides
diff --git a/chrome/browser/extensions/extension_save_page_api.cc b/chrome/browser/extensions/extension_save_page_api.cc
index 5942206..7fb8416 100644
--- a/chrome/browser/extensions/extension_save_page_api.cc
+++ b/chrome/browser/extensions/extension_save_page_api.cc
@@ -16,6 +16,8 @@
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 
+using content::BrowserThread;
+
 // Error messages.
 const char* const kFileTooBigError = "The MHTML file generated is too big.";
 const char* const kMHTMLGenerationFailedError = "Failed to generate MHTML.";
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index d4db48a..49b33e7 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -118,6 +118,7 @@
 #endif
 
 using base::Time;
+using content::BrowserThread;
 
 namespace errors = extension_manifest_errors;
 
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 145482e..f7c66dc 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -71,6 +71,8 @@
 #include "webkit/database/database_util.h"
 #include "webkit/quota/quota_manager.h"
 
+using content::BrowserThread;
+
 namespace keys = extension_manifest_keys;
 
 namespace {
diff --git a/chrome/browser/extensions/extension_settings_api.cc b/chrome/browser/extensions/extension_settings_api.cc
index 0113c86..60cb933 100644
--- a/chrome/browser/extensions/extension_settings_api.cc
+++ b/chrome/browser/extensions/extension_settings_api.cc
@@ -9,6 +9,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace {
 const char* kUnsupportedArgumentType = "Unsupported argument type";
 }  // namespace
diff --git a/chrome/browser/extensions/extension_settings_backend.cc b/chrome/browser/extensions/extension_settings_backend.cc
index ffaa828..ef87b51 100644
--- a/chrome/browser/extensions/extension_settings_backend.cc
+++ b/chrome/browser/extensions/extension_settings_backend.cc
@@ -21,6 +21,8 @@
 #include "third_party/leveldatabase/src/include/leveldb/iterator.h"
 #include "third_party/leveldatabase/src/include/leveldb/write_batch.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Total quota for all settings per extension, in bytes.  100K should be enough
diff --git a/chrome/browser/extensions/extension_settings_frontend.cc b/chrome/browser/extensions/extension_settings_frontend.cc
index f9233e4..077cfa8 100644
--- a/chrome/browser/extensions/extension_settings_frontend.cc
+++ b/chrome/browser/extensions/extension_settings_frontend.cc
@@ -14,6 +14,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 
+using content::BrowserThread;
+
 namespace {
 
 struct Backends {
diff --git a/chrome/browser/extensions/extension_settings_frontend_unittest.cc b/chrome/browser/extensions/extension_settings_frontend_unittest.cc
index 8a9c427..a7eb634 100644
--- a/chrome/browser/extensions/extension_settings_frontend_unittest.cc
+++ b/chrome/browser/extensions/extension_settings_frontend_unittest.cc
@@ -15,6 +15,8 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "content/test/test_browser_thread.h"
 
+using content::BrowserThread;
+
 using namespace extension_settings_test_util;
 
 class ExtensionSettingsFrontendTest : public testing::Test {
diff --git a/chrome/browser/extensions/extension_settings_leveldb_storage.cc b/chrome/browser/extensions/extension_settings_leveldb_storage.cc
index 3af3e22..96e11f6 100644
--- a/chrome/browser/extensions/extension_settings_leveldb_storage.cc
+++ b/chrome/browser/extensions/extension_settings_leveldb_storage.cc
@@ -15,6 +15,8 @@
 #include "third_party/leveldatabase/src/include/leveldb/iterator.h"
 #include "third_party/leveldatabase/src/include/leveldb/write_batch.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Generic error message sent to extensions on failure.
diff --git a/chrome/browser/extensions/extension_settings_storage_unittest.cc b/chrome/browser/extensions/extension_settings_storage_unittest.cc
index f3080ac..4bb04ee 100644
--- a/chrome/browser/extensions/extension_settings_storage_unittest.cc
+++ b/chrome/browser/extensions/extension_settings_storage_unittest.cc
@@ -8,6 +8,8 @@
 #include "base/file_util.h"
 #include "base/values.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Gets the pretty-printed JSON for a value.
diff --git a/chrome/browser/extensions/extension_settings_sync_unittest.cc b/chrome/browser/extensions/extension_settings_sync_unittest.cc
index 07418de..6068ade 100644
--- a/chrome/browser/extensions/extension_settings_sync_unittest.cc
+++ b/chrome/browser/extensions/extension_settings_sync_unittest.cc
@@ -19,6 +19,8 @@
 #include "chrome/browser/sync/api/sync_change_processor.h"
 #include "content/test/test_browser_thread.h"
 
+using content::BrowserThread;
+
 // TODO(kalman): Integration tests for sync.
 
 using namespace extension_settings_test_util;
diff --git a/chrome/browser/extensions/extension_special_storage_policy.cc b/chrome/browser/extensions/extension_special_storage_policy.cc
index 425fcca..23e6889 100644
--- a/chrome/browser/extensions/extension_special_storage_policy.cc
+++ b/chrome/browser/extensions/extension_special_storage_policy.cc
@@ -13,6 +13,8 @@
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 ExtensionSpecialStoragePolicy::ExtensionSpecialStoragePolicy(
     CookieSettings* cookie_settings)
     : cookie_settings_(cookie_settings) {}
diff --git a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc
index da64328..089cc14 100644
--- a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc
+++ b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc
@@ -13,6 +13,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace keys = extension_manifest_keys;
 
 class ExtensionSpecialStoragePolicyTest : public testing::Test {
diff --git a/chrome/browser/extensions/extension_tab_id_map.cc b/chrome/browser/extensions/extension_tab_id_map.cc
index f695419..5b436e2 100644
--- a/chrome/browser/extensions/extension_tab_id_map.cc
+++ b/chrome/browser/extensions/extension_tab_id_map.cc
@@ -18,6 +18,8 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 
+using content::BrowserThread;
+
 //
 // ExtensionTabIdMap::TabObserver
 //
diff --git a/chrome/browser/extensions/extension_updater.cc b/chrome/browser/extensions/extension_updater.cc
index bd4a869..433e9e0 100644
--- a/chrome/browser/extensions/extension_updater.cc
+++ b/chrome/browser/extensions/extension_updater.cc
@@ -56,6 +56,7 @@ using base::RandDouble;
 using base::RandInt;
 using base::Time;
 using base::TimeDelta;
+using content::BrowserThread;
 using prefs::kExtensionBlacklistUpdateVersion;
 using prefs::kLastExtensionsUpdateCheck;
 using prefs::kNextExtensionsUpdateCheck;
diff --git a/chrome/browser/extensions/extension_updater_unittest.cc b/chrome/browser/extensions/extension_updater_unittest.cc
index 6743dfb..7f916d6 100644
--- a/chrome/browser/extensions/extension_updater_unittest.cc
+++ b/chrome/browser/extensions/extension_updater_unittest.cc
@@ -37,6 +37,7 @@
 
 using base::Time;
 using base::TimeDelta;
+using content::BrowserThread;
 
 namespace {
 
diff --git a/chrome/browser/extensions/extension_warning_set.cc b/chrome/browser/extensions/extension_warning_set.cc
index 537019a..0c4c8ef2 100644
--- a/chrome/browser/extensions/extension_warning_set.cc
+++ b/chrome/browser/extensions/extension_warning_set.cc
@@ -18,6 +18,8 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 // This class is used to represent warnings if extensions misbehave.
 class ExtensionWarning {
  public:
diff --git a/chrome/browser/extensions/extension_webrequest_api.cc b/chrome/browser/extensions/extension_webrequest_api.cc
index 6ac9532..bc6b493 100644
--- a/chrome/browser/extensions/extension_webrequest_api.cc
+++ b/chrome/browser/extensions/extension_webrequest_api.cc
@@ -44,6 +44,8 @@
 #include "net/url_request/url_request.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 namespace keys = extension_webrequest_api_constants;
 
 namespace {
diff --git a/chrome/browser/extensions/extension_webrequest_time_tracker.cc b/chrome/browser/extensions/extension_webrequest_time_tracker.cc
index 1e54523..418dbd8 100644
--- a/chrome/browser/extensions/extension_webrequest_time_tracker.cc
+++ b/chrome/browser/extensions/extension_webrequest_time_tracker.cc
@@ -12,6 +12,8 @@
 #include "chrome/browser/extensions/extension_warning_set.h"
 #include "chrome/browser/profiles/profile_manager.h"
 
+using content::BrowserThread;
+
 // TODO(mpcomplete): tweak all these constants.
 namespace {
 // The number of requests we keep track of at a time.
diff --git a/chrome/browser/extensions/extensions_quota_service_unittest.cc b/chrome/browser/extensions/extensions_quota_service_unittest.cc
index e85026e..a5310b59 100644
--- a/chrome/browser/extensions/extensions_quota_service_unittest.cc
+++ b/chrome/browser/extensions/extensions_quota_service_unittest.cc
@@ -11,6 +11,7 @@
 
 using base::TimeDelta;
 using base::TimeTicks;
+using content::BrowserThread;
 
 typedef QuotaLimitHeuristic::Bucket Bucket;
 typedef QuotaLimitHeuristic::Config Config;
diff --git a/chrome/browser/extensions/external_extension_loader.cc b/chrome/browser/extensions/external_extension_loader.cc
index 43bd260..345eedc 100644
--- a/chrome/browser/extensions/external_extension_loader.cc
+++ b/chrome/browser/extensions/external_extension_loader.cc
@@ -9,6 +9,8 @@
 #include "chrome/browser/extensions/external_extension_provider_impl.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 ExternalExtensionLoader::ExternalExtensionLoader()
     : owner_(NULL),
       running_(false) {
diff --git a/chrome/browser/extensions/external_extension_provider_impl.cc b/chrome/browser/extensions/external_extension_provider_impl.cc
index 5934aa9..844b122 100644
--- a/chrome/browser/extensions/external_extension_provider_impl.cc
+++ b/chrome/browser/extensions/external_extension_provider_impl.cc
@@ -33,6 +33,8 @@
 #include "chrome/browser/extensions/external_registry_extension_loader_win.h"
 #endif
 
+using content::BrowserThread;
+
 // Constants for keeping track of extension preferences in a dictionary.
 const char ExternalExtensionProviderImpl::kExternalCrx[] = "external_crx";
 const char ExternalExtensionProviderImpl::kExternalVersion[] =
diff --git a/chrome/browser/extensions/external_policy_extension_loader_unittest.cc b/chrome/browser/extensions/external_policy_extension_loader_unittest.cc
index db8c6bf..c5fa9f5 100644
--- a/chrome/browser/extensions/external_policy_extension_loader_unittest.cc
+++ b/chrome/browser/extensions/external_policy_extension_loader_unittest.cc
@@ -18,6 +18,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 class ExternalPolicyExtensionProviderTest : public testing::Test {
  public:
   ExternalPolicyExtensionProviderTest()
diff --git a/chrome/browser/extensions/external_pref_extension_loader.cc b/chrome/browser/extensions/external_pref_extension_loader.cc
index be52493..ad30c3b 100644
--- a/chrome/browser/extensions/external_pref_extension_loader.cc
+++ b/chrome/browser/extensions/external_pref_extension_loader.cc
@@ -14,6 +14,8 @@
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Caller takes ownership of the returned dictionary.
diff --git a/chrome/browser/extensions/external_registry_extension_loader_win.cc b/chrome/browser/extensions/external_registry_extension_loader_win.cc
index b67eab1b..a494be5 100644
--- a/chrome/browser/extensions/external_registry_extension_loader_win.cc
+++ b/chrome/browser/extensions/external_registry_extension_loader_win.cc
@@ -16,6 +16,8 @@
 #include "chrome/browser/extensions/external_extension_provider_impl.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // The Registry subkey that contains information about external extensions.
diff --git a/chrome/browser/extensions/file_manager_util.cc b/chrome/browser/extensions/file_manager_util.cc
index 734d5f8..fd5da6e1 100644
--- a/chrome/browser/extensions/file_manager_util.cc
+++ b/chrome/browser/extensions/file_manager_util.cc
@@ -32,6 +32,8 @@
 #include "chrome/browser/chromeos/media/media_player.h"
 #endif
 
+using content::BrowserThread;
+
 #define FILEBROWSER_DOMAIN "hhaomjibdihmijegdhdafkllkbggdgoj"
 const char kFileBrowserDomain[] = FILEBROWSER_DOMAIN;
 #define FILEBROWSER_URL(PATH) \
diff --git a/chrome/browser/extensions/file_reader.cc b/chrome/browser/extensions/file_reader.cc
index 247540d..b2cbc77 100644
--- a/chrome/browser/extensions/file_reader.cc
+++ b/chrome/browser/extensions/file_reader.cc
@@ -9,6 +9,8 @@
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 FileReader::FileReader(const ExtensionResource& resource, Callback* callback)
     : resource_(resource),
       callback_(callback),
diff --git a/chrome/browser/extensions/file_reader_unittest.cc b/chrome/browser/extensions/file_reader_unittest.cc
index d7d63c0..d9ef15e 100644
--- a/chrome/browser/extensions/file_reader_unittest.cc
+++ b/chrome/browser/extensions/file_reader_unittest.cc
@@ -15,6 +15,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace {
 
 class FileReaderTest : public testing::Test {
diff --git a/chrome/browser/extensions/image_loading_tracker.cc b/chrome/browser/extensions/image_loading_tracker.cc
index 193bd4d..e8d7351 100644
--- a/chrome/browser/extensions/image_loading_tracker.cc
+++ b/chrome/browser/extensions/image_loading_tracker.cc
@@ -15,6 +15,8 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "webkit/glue/image_decoder.h"
 
+using content::BrowserThread;
+
 ImageLoadingTracker::Observer::~Observer() {}
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/extensions/image_loading_tracker_unittest.cc b/chrome/browser/extensions/image_loading_tracker_unittest.cc
index e239a61..5bdb118 100644
--- a/chrome/browser/extensions/image_loading_tracker_unittest.cc
+++ b/chrome/browser/extensions/image_loading_tracker_unittest.cc
@@ -17,6 +17,8 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/size.h"
 
+using content::BrowserThread;
+
 class ImageLoadingTrackerTest : public testing::Test,
                                 public ImageLoadingTracker::Observer {
  public:
diff --git a/chrome/browser/extensions/key_identifier_conversion_views.cc b/chrome/browser/extensions/key_identifier_conversion_views.cc
index 3a786a2..23f9375 100644
--- a/chrome/browser/extensions/key_identifier_conversion_views.cc
+++ b/chrome/browser/extensions/key_identifier_conversion_views.cc
@@ -12,6 +12,8 @@
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "views/events/event.h"
 
+using content::BrowserThread;
+
 namespace {
 
 static const int kNumIdentifierTypes = 3;
diff --git a/chrome/browser/extensions/key_identifier_conversion_views_unittest.cc b/chrome/browser/extensions/key_identifier_conversion_views_unittest.cc
index d1108b2..0edccdc 100644
--- a/chrome/browser/extensions/key_identifier_conversion_views_unittest.cc
+++ b/chrome/browser/extensions/key_identifier_conversion_views_unittest.cc
@@ -11,6 +11,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 
+using content::BrowserThread;
+
 namespace {
 
 class KeyEventFromKeyIdentifierTest : public testing::Test {
diff --git a/chrome/browser/extensions/network_delay_listener.cc b/chrome/browser/extensions/network_delay_listener.cc
index e9a7160..40c8919 100644
--- a/chrome/browser/extensions/network_delay_listener.cc
+++ b/chrome/browser/extensions/network_delay_listener.cc
@@ -17,6 +17,8 @@
 #include "content/public/browser/notification_service.h"
 #include "net/url_request/url_request.h"
 
+using content::BrowserThread;
+
 NetworkDelayListener::NetworkDelayListener()
     : resource_queue_(NULL),
       extensions_ready_(true),
diff --git a/chrome/browser/extensions/pack_extension_job.cc b/chrome/browser/extensions/pack_extension_job.cc
index a804555..e7d58be 100644
--- a/chrome/browser/extensions/pack_extension_job.cc
+++ b/chrome/browser/extensions/pack_extension_job.cc
@@ -13,6 +13,8 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 PackExtensionJob::PackExtensionJob(Client* client,
                                    const FilePath& root_directory,
                                    const FilePath& key_file)
diff --git a/chrome/browser/extensions/pack_extension_job.h b/chrome/browser/extensions/pack_extension_job.h
index 0185d8b..ed479cf 100644
--- a/chrome/browser/extensions/pack_extension_job.h
+++ b/chrome/browser/extensions/pack_extension_job.h
@@ -57,7 +57,7 @@ class PackExtensionJob : public base::RefCountedThreadSafe<PackExtensionJob> {
   void ReportSuccessOnClientThread();
   void ReportFailureOnClientThread(const std::string& error);
 
-  BrowserThread::ID client_thread_id_;
+  content::BrowserThread::ID client_thread_id_;
   Client* client_;
   FilePath root_directory_;
   FilePath key_file_;
diff --git a/chrome/browser/extensions/pending_extension_manager.cc b/chrome/browser/extensions/pending_extension_manager.cc
index d07170b..c11ebf8 100644
--- a/chrome/browser/extensions/pending_extension_manager.cc
+++ b/chrome/browser/extensions/pending_extension_manager.cc
@@ -9,6 +9,8 @@
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Install predicate used by AddFromExternalUpdateUrl().
diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker.cc b/chrome/browser/extensions/sandboxed_extension_unpacker.cc
index 69dd6f9..c031f97 100644
--- a/chrome/browser/extensions/sandboxed_extension_unpacker.cc
+++ b/chrome/browser/extensions/sandboxed_extension_unpacker.cc
@@ -32,6 +32,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/codec/png_codec.h"
 
+using content::BrowserThread;
+
 // The following macro makes histograms that record the length of paths
 // in this file much easier to read.
 // Windows has a short max path length. If the path length to a
diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker.h b/chrome/browser/extensions/sandboxed_extension_unpacker.h
index 43907ef..57b4a6f 100644
--- a/chrome/browser/extensions/sandboxed_extension_unpacker.h
+++ b/chrome/browser/extensions/sandboxed_extension_unpacker.h
@@ -218,7 +218,7 @@ class SandboxedExtensionUnpacker : public UtilityProcessHost::Client {
   FilePath crx_path_;
 
   // Our client's thread. This is the thread we respond on.
-  BrowserThread::ID thread_identifier_;
+  content::BrowserThread::ID thread_identifier_;
 
   // ResourceDispatcherHost to pass to the utility process.
   ResourceDispatcherHost* rdh_;
diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc b/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc
index e09d38e..b5cf742 100644
--- a/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc
+++ b/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc
@@ -22,6 +22,7 @@
 namespace errors = extension_manifest_errors;
 namespace keys = extension_manifest_keys;
 
+using content::BrowserThread;
 using testing::_;
 using testing::Invoke;
 
diff --git a/chrome/browser/extensions/speech_input/extension_speech_input_apitest.cc b/chrome/browser/extensions/speech_input/extension_speech_input_apitest.cc
index 780212b..4d20892 100644
--- a/chrome/browser/extensions/speech_input/extension_speech_input_apitest.cc
+++ b/chrome/browser/extensions/speech_input/extension_speech_input_apitest.cc
@@ -15,6 +15,8 @@
 #include "content/common/speech_input_result.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace net {
 class URLRequestContextGetter;
 }
diff --git a/chrome/browser/extensions/speech_input/extension_speech_input_manager.cc b/chrome/browser/extensions/speech_input/extension_speech_input_manager.cc
index 74f9669..b8c6bf5 100644
--- a/chrome/browser/extensions/speech_input/extension_speech_input_manager.cc
+++ b/chrome/browser/extensions/speech_input/extension_speech_input_manager.cc
@@ -19,6 +19,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 
+using content::BrowserThread;
+
 using namespace speech_input;
 
 namespace constants = extension_speech_input_api_constants;
diff --git a/chrome/browser/extensions/syncable_extension_settings_storage.cc b/chrome/browser/extensions/syncable_extension_settings_storage.cc
index bd5f3d1..42152cc 100644
--- a/chrome/browser/extensions/syncable_extension_settings_storage.cc
+++ b/chrome/browser/extensions/syncable_extension_settings_storage.cc
@@ -10,6 +10,8 @@
 #include "chrome/browser/sync/protocol/extension_setting_specifics.pb.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 SyncableExtensionSettingsStorage::SyncableExtensionSettingsStorage(
     const scoped_refptr<ObserverListThreadSafe<ExtensionSettingsObserver> >&
         observers,
diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc
index 6dd07cf..f6ddc0f 100644
--- a/chrome/browser/extensions/test_extension_prefs.cc
+++ b/chrome/browser/extensions/test_extension_prefs.cc
@@ -23,6 +23,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Mock ExtensionPrefs class with artificial clock to guarantee that no two
diff --git a/chrome/browser/extensions/user_script_listener.cc b/chrome/browser/extensions/user_script_listener.cc
index d7b9937..5a54e20 100644
--- a/chrome/browser/extensions/user_script_listener.cc
+++ b/chrome/browser/extensions/user_script_listener.cc
@@ -15,6 +15,8 @@
 #include "content/public/browser/notification_service.h"
 #include "net/url_request/url_request.h"
 
+using content::BrowserThread;
+
 struct UserScriptListener::ProfileData {
   // True if the user scripts contained in |url_patterns| are ready for
   // injection.
diff --git a/chrome/browser/extensions/user_script_master.cc b/chrome/browser/extensions/user_script_master.cc
index f28003d..f936459 100644
--- a/chrome/browser/extensions/user_script_master.cc
+++ b/chrome/browser/extensions/user_script_master.cc
@@ -27,6 +27,8 @@
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/public/browser/notification_service.h"
 
+using content::BrowserThread;
+
 // Helper function to parse greasesmonkey headers
 static bool GetDeclarationValue(const base::StringPiece& line,
                                 const base::StringPiece& prefix,
diff --git a/chrome/browser/extensions/user_script_master.h b/chrome/browser/extensions/user_script_master.h
index f3ef806..291d932 100644
--- a/chrome/browser/extensions/user_script_master.h
+++ b/chrome/browser/extensions/user_script_master.h
@@ -123,7 +123,7 @@ class UserScriptMaster : public base::RefCountedThreadSafe<UserScriptMaster>,
 
     // The message loop to call our master back on.
     // Expected to always outlive us.
-    BrowserThread::ID master_thread_id_;
+    content::BrowserThread::ID master_thread_id_;
 
     DISALLOW_COPY_AND_ASSIGN(ScriptReloader);
   };
diff --git a/chrome/browser/extensions/user_script_master_unittest.cc b/chrome/browser/extensions/user_script_master_unittest.cc
index 7e494a5..ef6a172 100644
--- a/chrome/browser/extensions/user_script_master_unittest.cc
+++ b/chrome/browser/extensions/user_script_master_unittest.cc
@@ -19,6 +19,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace {
 
 static void AddPattern(URLPatternSet* extent, const std::string& pattern) {
diff --git a/chrome/browser/extensions/webstore_inline_installer.cc b/chrome/browser/extensions/webstore_inline_installer.cc
index 0c0359b..a3af2c6 100644
--- a/chrome/browser/extensions/webstore_inline_installer.cc
+++ b/chrome/browser/extensions/webstore_inline_installer.cc
@@ -25,6 +25,8 @@
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_status.h"
 
+using content::BrowserThread;
+
 const char kManifestKey[] = "manifest";
 const char kIconUrlKey[] = "icon_url";
 const char kLocalizedNameKey[] = "localized_name";
diff --git a/chrome/browser/extensions/webstore_install_helper.cc b/chrome/browser/extensions/webstore_install_helper.cc
index e2914f5..fabfd7d 100644
--- a/chrome/browser/extensions/webstore_install_helper.cc
+++ b/chrome/browser/extensions/webstore_install_helper.cc
@@ -14,6 +14,8 @@
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
+using content::BrowserThread;
+
 namespace {
 
 const char kImageDecodeError[] = "Image decode failed";
diff --git a/chrome/browser/external_protocol/external_protocol_handler_unittest.cc b/chrome/browser/external_protocol/external_protocol_handler_unittest.cc
index 739f07e..51d5ff2 100644
--- a/chrome/browser/external_protocol/external_protocol_handler_unittest.cc
+++ b/chrome/browser/external_protocol/external_protocol_handler_unittest.cc
@@ -7,6 +7,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 class FakeExternalProtocolHandlerWorker
     : public ShellIntegration::DefaultProtocolClientWorker {
  public:
diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc
index 4ce7638..5d6bc58 100644
--- a/chrome/browser/external_tab_container_win.cc
+++ b/chrome/browser/external_tab_container_win.cc
@@ -57,6 +57,7 @@
 #include "ui/base/models/menu_model.h"
 #include "views/layout/grid_layout.h"
 
+using content::BrowserThread;
 using ui::ViewProp;
 
 static const char kWindowObjectKey[] = "ChromeWindowObject";
diff --git a/chrome/browser/fast_shutdown_uitest.cc b/chrome/browser/fast_shutdown_uitest.cc
index 0237fe4..f21b426 100644
--- a/chrome/browser/fast_shutdown_uitest.cc
+++ b/chrome/browser/fast_shutdown_uitest.cc
@@ -15,6 +15,8 @@
 #include "chrome/test/ui/ui_test.h"
 #include "content/test/test_browser_thread.h"
 
+using content::BrowserThread;
+
 class FastShutdown : public UITest {
  protected:
   FastShutdown()
diff --git a/chrome/browser/file_select_helper.cc b/chrome/browser/file_select_helper.cc
index 4e13308..4e5118d 100644
--- a/chrome/browser/file_select_helper.cc
+++ b/chrome/browser/file_select_helper.cc
@@ -28,6 +28,8 @@
 #include "net/base/mime_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // There is only one file-selection happening at any given time,
diff --git a/chrome/browser/geolocation/access_token_store_browsertest.cc b/chrome/browser/geolocation/access_token_store_browsertest.cc
index ce38af0..8f21c21 100644
--- a/chrome/browser/geolocation/access_token_store_browsertest.cc
+++ b/chrome/browser/geolocation/access_token_store_browsertest.cc
@@ -11,6 +11,8 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/test/test_browser_thread.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // The token store factory implementation expects to be used from any well-known
diff --git a/chrome/browser/geolocation/chrome_access_token_store.cc b/chrome/browser/geolocation/chrome_access_token_store.cc
index 3f4b1f0..d0fcd39 100644
--- a/chrome/browser/geolocation/chrome_access_token_store.cc
+++ b/chrome/browser/geolocation/chrome_access_token_store.cc
@@ -15,6 +15,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 
+using content::BrowserThread;
+
 namespace {
 // This was the default location service url for Chrome versions 14 and earlier
 // but is no longer supported.
diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
index c3569e0..b160c38 100644
--- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
+++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
@@ -37,6 +37,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+using content::BrowserThread;
+
 // GeolocationInfoBarQueueController ------------------------------------------
 
 // This class controls the geolocation infobar queue per profile, and it's an
diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc
index b89c993..f7f93e3 100644
--- a/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc
+++ b/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc
@@ -28,6 +28,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 // ClosedDelegateTracker ------------------------------------------------------
 
 namespace {
diff --git a/chrome/browser/geolocation/geolocation_settings_state_unittest.cc b/chrome/browser/geolocation/geolocation_settings_state_unittest.cc
index 79bcc88..e762644 100644
--- a/chrome/browser/geolocation/geolocation_settings_state_unittest.cc
+++ b/chrome/browser/geolocation/geolocation_settings_state_unittest.cc
@@ -12,6 +12,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace {
 
 class GeolocationSettingsStateTests : public testing::Test {
diff --git a/chrome/browser/geolocation/wifi_data_provider_chromeos.cc b/chrome/browser/geolocation/wifi_data_provider_chromeos.cc
index 13f11d3..895eea9 100644
--- a/chrome/browser/geolocation/wifi_data_provider_chromeos.cc
+++ b/chrome/browser/geolocation/wifi_data_provider_chromeos.cc
@@ -12,6 +12,8 @@
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace {
 // The time periods between successive polls of the wifi data.
 const int kDefaultPollingIntervalMilliseconds = 10 * 1000;  // 10s
diff --git a/chrome/browser/google/google_update.cc b/chrome/browser/google/google_update.cc
index 317201d..8133ca5 100644
--- a/chrome/browser/google/google_update.cc
+++ b/chrome/browser/google/google_update.cc
@@ -29,6 +29,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "views/widget/widget.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Check if the currently running instance can be updated by Google Update.
diff --git a/chrome/browser/google/google_url_tracker_unittest.cc b/chrome/browser/google/google_url_tracker_unittest.cc
index e38a140..0ae50d1 100644
--- a/chrome/browser/google/google_url_tracker_unittest.cc
+++ b/chrome/browser/google/google_url_tracker_unittest.cc
@@ -22,6 +22,8 @@
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 // TestNotificationObserver ---------------------------------------------------
 
 namespace {
diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc
index 415db58..3287992 100644
--- a/chrome/browser/history/expire_history_backend_unittest.cc
+++ b/chrome/browser/history/expire_history_backend_unittest.cc
@@ -35,6 +35,7 @@
 using base::Time;
 using base::TimeDelta;
 using base::TimeTicks;
+using content::BrowserThread;
 
 // Filename constants.
 static const FilePath::CharType kHistoryFile[] = FILE_PATH_LITERAL("History");
diff --git a/chrome/browser/history/history_browsertest.cc b/chrome/browser/history/history_browsertest.cc
index 6f37766..3dfc370 100644
--- a/chrome/browser/history/history_browsertest.cc
+++ b/chrome/browser/history/history_browsertest.cc
@@ -16,6 +16,8 @@
 #include "content/test/test_browser_thread.h"
 #include "googleurl/src/gurl.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Note: WaitableEvent is not used for synchronization between the main thread
diff --git a/chrome/browser/history/shortcuts_backend.cc b/chrome/browser/history/shortcuts_backend.cc
index b65b56b..d3e100a 100644
--- a/chrome/browser/history/shortcuts_backend.cc
+++ b/chrome/browser/history/shortcuts_backend.cc
@@ -25,6 +25,8 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 
+using content::BrowserThread;
+
 namespace history {
 
 ShortcutsBackend::ShortcutsBackend(const FilePath& db_folder_path,
diff --git a/chrome/browser/history/shortcuts_backend_unittest.cc b/chrome/browser/history/shortcuts_backend_unittest.cc
index 515232e..60277c9 100644
--- a/chrome/browser/history/shortcuts_backend_unittest.cc
+++ b/chrome/browser/history/shortcuts_backend_unittest.cc
@@ -17,6 +17,7 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using shortcuts_provider::Shortcut;
 using shortcuts_provider::ShortcutMap;
 
diff --git a/chrome/browser/history/top_sites.cc b/chrome/browser/history/top_sites.cc
index 6cc3248..922895c 100644
--- a/chrome/browser/history/top_sites.cc
+++ b/chrome/browser/history/top_sites.cc
@@ -41,6 +41,8 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_util.h"
 
+using content::BrowserThread;
+
 namespace history {
 
 // How many top sites to store in the cache.
diff --git a/chrome/browser/history/top_sites_backend.cc b/chrome/browser/history/top_sites_backend.cc
index f0db0fe..3ec60b0 100644
--- a/chrome/browser/history/top_sites_backend.cc
+++ b/chrome/browser/history/top_sites_backend.cc
@@ -11,6 +11,8 @@
 #include "chrome/browser/history/top_sites_database.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace history {
 
 TopSitesBackend::TopSitesBackend()
diff --git a/chrome/browser/history/top_sites_unittest.cc b/chrome/browser/history/top_sites_unittest.cc
index 8f55eec..074dee5 100644
--- a/chrome/browser/history/top_sites_unittest.cc
+++ b/chrome/browser/history/top_sites_unittest.cc
@@ -39,6 +39,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 
+using content::BrowserThread;
+
 namespace history {
 
 namespace {
diff --git a/chrome/browser/icon_loader.cc b/chrome/browser/icon_loader.cc
index 5ce4e11..9670551 100644
--- a/chrome/browser/icon_loader.cc
+++ b/chrome/browser/icon_loader.cc
@@ -12,6 +12,8 @@
 #include "base/mime_util.h"
 #endif
 
+using content::BrowserThread;
+
 IconLoader::IconLoader(const IconGroupID& group, IconSize size,
                        Delegate* delegate)
     : target_message_loop_(NULL),
diff --git a/chrome/browser/idbbindingutilities_browsertest.cc b/chrome/browser/idbbindingutilities_browsertest.cc
index 1785fb6..d8bb0e2 100644
--- a/chrome/browser/idbbindingutilities_browsertest.cc
+++ b/chrome/browser/idbbindingutilities_browsertest.cc
@@ -19,6 +19,7 @@
 #include "webkit/glue/web_io_operators.h"
 #include "webkit/glue/webkitplatformsupport_impl.h"
 
+using content::BrowserThread;
 using WebKit::WebSerializedScriptValue;
 
 // Enables calling WebKit::shutdown no matter where a "return" happens.
diff --git a/chrome/browser/importer/external_process_importer_client.cc b/chrome/browser/importer/external_process_importer_client.cc
index 0ffa458..21eacf5 100644
--- a/chrome/browser/importer/external_process_importer_client.cc
+++ b/chrome/browser/importer/external_process_importer_client.cc
@@ -19,6 +19,8 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 ExternalProcessImporterClient::ExternalProcessImporterClient(
     ExternalProcessImporterHost* importer_host,
     const importer::SourceProfile& source_profile,
diff --git a/chrome/browser/importer/external_process_importer_client.h b/chrome/browser/importer/external_process_importer_client.h
index 6dcc6f9..cef137e 100644
--- a/chrome/browser/importer/external_process_importer_client.h
+++ b/chrome/browser/importer/external_process_importer_client.h
@@ -50,7 +50,7 @@ class ExternalProcessImporterClient : public UtilityProcessHost::Client {
   virtual void Start();
 
   // Creates a new UtilityProcessHost, which launches the import process.
-  virtual void StartProcessOnIOThread(BrowserThread::ID thread_id);
+  virtual void StartProcessOnIOThread(content::BrowserThread::ID thread_id);
 
   // Called by the ExternalProcessImporterHost on import cancel.
   virtual void Cancel();
diff --git a/chrome/browser/importer/firefox3_importer.cc b/chrome/browser/importer/firefox3_importer.cc
index 512b5e1..8a25e40 100644
--- a/chrome/browser/importer/firefox3_importer.cc
+++ b/chrome/browser/importer/firefox3_importer.cc
@@ -28,6 +28,8 @@
 #include "sql/statement.h"
 #include "webkit/glue/password_form.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Original definition is in http://mxr.mozilla.org/firefox/source/toolkit/
diff --git a/chrome/browser/importer/importer_host.cc b/chrome/browser/importer/importer_host.cc
index a49fbf2..5f307c8d 100644
--- a/chrome/browser/importer/importer_host.cc
+++ b/chrome/browser/importer/importer_host.cc
@@ -33,6 +33,8 @@
 #include "ui/base/message_box_win.h"
 #endif
 
+using content::BrowserThread;
+
 ImporterHost::ImporterHost()
     : profile_(NULL),
       waiting_for_bookmarkbar_model_(false),
diff --git a/chrome/browser/importer/importer_list.cc b/chrome/browser/importer/importer_list.cc
index 1c48396..06c78a1 100644
--- a/chrome/browser/importer/importer_list.cc
+++ b/chrome/browser/importer/importer_list.cc
@@ -21,6 +21,8 @@
 #include "chrome/browser/importer/safari_importer.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 #if defined(OS_WIN)
diff --git a/chrome/browser/importer/importer_list.h b/chrome/browser/importer/importer_list.h
index 0b58506..b833024 100644
--- a/chrome/browser/importer/importer_list.h
+++ b/chrome/browser/importer/importer_list.h
@@ -75,7 +75,7 @@ class ImporterList : public base::RefCountedThreadSafe<ImporterList> {
   // The ID of the thread DetectSourceProfiles() is called on. Only valid after
   // DetectSourceProfiles() is called and until SourceProfilesLoaded() has
   // returned.
-  BrowserThread::ID source_thread_id_;
+  content::BrowserThread::ID source_thread_id_;
 
   // Weak reference. Only valid after DetectSourceProfiles() is called and until
   // SourceProfilesLoaded() has returned.
diff --git a/chrome/browser/importer/importer_unittest.cc b/chrome/browser/importer/importer_unittest.cc
index 5de304c..7e5a5e7 100644
--- a/chrome/browser/importer/importer_unittest.cc
+++ b/chrome/browser/importer/importer_unittest.cc
@@ -52,6 +52,8 @@
 #define MAYBE(x) x
 #endif
 
+using content::BrowserThread;
+
 class ImporterTest : public testing::Test {
  public:
   ImporterTest()
diff --git a/chrome/browser/importer/in_process_importer_bridge.cc b/chrome/browser/importer/in_process_importer_bridge.cc
index 7290028..ebc8424 100644
--- a/chrome/browser/importer/in_process_importer_bridge.cc
+++ b/chrome/browser/importer/in_process_importer_bridge.cc
@@ -15,6 +15,8 @@
 #include "chrome/browser/password_manager/ie7_password.h"
 #endif
 
+using content::BrowserThread;
+
 InProcessImporterBridge::InProcessImporterBridge(ProfileWriter* writer,
                                                  ImporterHost* host)
     : writer_(writer),
diff --git a/chrome/browser/importer/toolbar_importer.cc b/chrome/browser/importer/toolbar_importer.cc
index ec610ca..971869c 100644
--- a/chrome/browser/importer/toolbar_importer.cc
+++ b/chrome/browser/importer/toolbar_importer.cc
@@ -20,6 +20,8 @@
 #include "content/public/common/url_fetcher.h"
 #include "grit/generated_resources.h"
 
+using content::BrowserThread;
+
 // Toolbar5Importer
 const char Toolbar5Importer::kXmlApiReplyXmlTag[] = "xml_api_reply";
 const char Toolbar5Importer::kBookmarksXmlTag[] = "bookmarks";
diff --git a/chrome/browser/importer/toolbar_importer_utils.cc b/chrome/browser/importer/toolbar_importer_utils.cc
index 555b5a7..b6fb0ec 100644
--- a/chrome/browser/importer/toolbar_importer_utils.cc
+++ b/chrome/browser/importer/toolbar_importer_utils.cc
@@ -16,6 +16,8 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
+using content::BrowserThread;
+
 namespace {
 const char kGoogleDomainUrl[] = "http://.google.com/";
 const char kGoogleDomainSecureCookieId[] = "SID=";
diff --git a/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc b/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc
index cf647e8..c273e68 100644
--- a/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc
+++ b/chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc
@@ -15,6 +15,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/web_intent_service_data.h"
 
+using content::BrowserThread;
+
 namespace {
 
 class MockWebIntentsRegistry : public WebIntentsRegistry {
diff --git a/chrome/browser/intents/web_intents_registry_unittest.cc b/chrome/browser/intents/web_intents_registry_unittest.cc
index 1b13a92..01a4cae 100644
--- a/chrome/browser/intents/web_intents_registry_unittest.cc
+++ b/chrome/browser/intents/web_intents_registry_unittest.cc
@@ -14,6 +14,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using webkit_glue::WebIntentServiceData;
 
 class MockExtensionService: public ExtensionServiceInterface {
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 8781125..666f3c0 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -62,6 +62,8 @@
 #include "net/ocsp/nss_ocsp.h"
 #endif  // defined(USE_NSS)
 
+using content::BrowserThread;
+
 namespace {
 
 // Custom URLRequestContext used by requests which aren't associated with a
diff --git a/chrome/browser/jankometer.cc b/chrome/browser/jankometer.cc
index 42c7887..a82d87d 100644
--- a/chrome/browser/jankometer.cc
+++ b/chrome/browser/jankometer.cc
@@ -27,6 +27,7 @@
 
 using base::TimeDelta;
 using base::TimeTicks;
+using content::BrowserThread;
 
 namespace {
 
diff --git a/chrome/browser/jumplist_win.cc b/chrome/browser/jumplist_win.cc
index 8aef301..02e8d35 100644
--- a/chrome/browser/jumplist_win.cc
+++ b/chrome/browser/jumplist_win.cc
@@ -45,6 +45,7 @@
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/icon_util.h"
 
+using content::BrowserThread;
 
 namespace {
 
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc
index d6a1452..138a51d 100644
--- a/chrome/browser/memory_details.cc
+++ b/chrome/browser/memory_details.cc
@@ -33,6 +33,8 @@
 #include "content/browser/zygote_host_linux.h"
 #endif
 
+using content::BrowserThread;
+
 ProcessMemoryInformation::ProcessMemoryInformation()
     : pid(0),
       num_processes(0),
diff --git a/chrome/browser/memory_details_linux.cc b/chrome/browser/memory_details_linux.cc
index f7a4a5d..afa1994 100644
--- a/chrome/browser/memory_details_linux.cc
+++ b/chrome/browser/memory_details_linux.cc
@@ -23,6 +23,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "grit/chromium_strings.h"
 
+using content::BrowserThread;
+
 // Known browsers which we collect details for.
 enum BrowserType {
   CHROME = 0,
diff --git a/chrome/browser/memory_details_mac.cc b/chrome/browser/memory_details_mac.cc
index 0f64955..b2554f8 100644
--- a/chrome/browser/memory_details_mac.cc
+++ b/chrome/browser/memory_details_mac.cc
@@ -28,6 +28,8 @@
 #include "grit/chromium_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 // TODO(viettrungluu): Many of the TODOs below are subsumed by a general need to
 // refactor the about:memory code (not just on Mac, but probably on other
 // platforms as well). I've filed crbug.com/25456.
diff --git a/chrome/browser/memory_details_win.cc b/chrome/browser/memory_details_win.cc
index 2abf2d7..d94000c 100644
--- a/chrome/browser/memory_details_win.cc
+++ b/chrome/browser/memory_details_win.cc
@@ -23,6 +23,8 @@
 #include "grit/chromium_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 // Known browsers which we collect details for.
 enum {
   CHROME_BROWSER = 0,
diff --git a/chrome/browser/memory_purger.cc b/chrome/browser/memory_purger.cc
index 2acd742..5bce67c 100644
--- a/chrome/browser/memory_purger.cc
+++ b/chrome/browser/memory_purger.cc
@@ -25,6 +25,8 @@
 #include "net/url_request/url_request_context_getter.h"
 #include "third_party/tcmalloc/chromium/src/google/malloc_extension.h"
 
+using content::BrowserThread;
+
 // PurgeMemoryHelper -----------------------------------------------------------
 
 // This is a small helper class used to ensure that the objects we want to use
diff --git a/chrome/browser/metrics/field_trial_synchronizer.cc b/chrome/browser/metrics/field_trial_synchronizer.cc
index d66c076..bef65bb 100644
--- a/chrome/browser/metrics/field_trial_synchronizer.cc
+++ b/chrome/browser/metrics/field_trial_synchronizer.cc
@@ -11,6 +11,8 @@
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 FieldTrialSynchronizer::FieldTrialSynchronizer() {
   DCHECK(field_trial_synchronizer_ == NULL);
   field_trial_synchronizer_ = this;
diff --git a/chrome/browser/metrics/histogram_synchronizer.cc b/chrome/browser/metrics/histogram_synchronizer.cc
index 11149e3..3f87718 100644
--- a/chrome/browser/metrics/histogram_synchronizer.cc
+++ b/chrome/browser/metrics/histogram_synchronizer.cc
@@ -15,6 +15,7 @@
 using base::Time;
 using base::TimeDelta;
 using base::TimeTicks;
+using content::BrowserThread;
 
 // Negative numbers are never used as sequence numbers.  We explicitly pick a
 // negative number that is "so negative" that even when we add one (as is done
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index bd5c099..2342d74 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -196,6 +196,7 @@
 #endif
 
 using base::Time;
+using content::BrowserThread;
 
 // Check to see that we're being called on only one thread.
 static bool IsSingleThreaded();
diff --git a/chrome/browser/metrics/thread_watcher.cc b/chrome/browser/metrics/thread_watcher.cc
index 0b72b28..4252580 100644
--- a/chrome/browser/metrics/thread_watcher.cc
+++ b/chrome/browser/metrics/thread_watcher.cc
@@ -20,6 +20,8 @@
 #include "base/win/windows_version.h"
 #endif
 
+using content::BrowserThread;
+
 // ThreadWatcher methods and members.
 ThreadWatcher::ThreadWatcher(const WatchingParams& params)
     : thread_id_(params.thread_id),
diff --git a/chrome/browser/metrics/thread_watcher.h b/chrome/browser/metrics/thread_watcher.h
index a906c78..a36cbac 100644
--- a/chrome/browser/metrics/thread_watcher.h
+++ b/chrome/browser/metrics/thread_watcher.h
@@ -74,7 +74,7 @@ class ThreadWatcher {
   // base::Bind supports methods with up to 6 parameters. WatchingParams is used
   // as a workaround that limitation for invoking ThreadWatcher::StartWatching.
   struct WatchingParams {
-    const BrowserThread::ID& thread_id;
+    const content::BrowserThread::ID& thread_id;
     const std::string& thread_name;
     const base::TimeDelta& sleep_time;
     const base::TimeDelta& unresponsive_time;
@@ -82,7 +82,7 @@ class ThreadWatcher {
     bool crash_on_hang;
     uint32 live_threads_threshold;
 
-    WatchingParams(const BrowserThread::ID& thread_id_in,
+    WatchingParams(const content::BrowserThread::ID& thread_id_in,
                    const std::string& thread_name_in,
                    const base::TimeDelta& sleep_time_in,
                    const base::TimeDelta& unresponsive_time_in,
@@ -115,7 +115,7 @@ class ThreadWatcher {
   static void StartWatching(const WatchingParams& params);
 
   // Return the |thread_id_| of the thread being watched.
-  BrowserThread::ID thread_id() const { return thread_id_; }
+  content::BrowserThread::ID thread_id() const { return thread_id_; }
 
   // Return the name of the thread being watched.
   std::string thread_name() const { return thread_name_; }
@@ -197,7 +197,7 @@ class ThreadWatcher {
 
   // Watched thread does nothing except post callback_task to the WATCHDOG
   // Thread. This method is called on watched thread.
-  static void OnPingMessage(const BrowserThread::ID& thread_id,
+  static void OnPingMessage(const content::BrowserThread::ID& thread_id,
                             const base::Closure& callback_task);
 
   // This method resets |unresponsive_count_| to zero because watched thread is
@@ -214,7 +214,7 @@ class ThreadWatcher {
 
   // The |thread_id_| of the thread being watched. Only one instance can exist
   // for the given |thread_id_| of the thread being watched.
-  const BrowserThread::ID thread_id_;
+  const content::BrowserThread::ID thread_id_;
 
   // The name of the thread being watched.
   const std::string thread_name_;
@@ -307,7 +307,7 @@ class ThreadWatcher {
 class ThreadWatcherList {
  public:
   // A map from BrowserThread to the actual instances.
-  typedef std::map<BrowserThread::ID, ThreadWatcher*> RegistrationList;
+  typedef std::map<content::BrowserThread::ID, ThreadWatcher*> RegistrationList;
 
   // This method posts a task on WatchDogThread to start watching all browser
   // threads.
@@ -324,7 +324,7 @@ class ThreadWatcherList {
   static void Register(ThreadWatcher* watcher);
 
   // This method returns true if the ThreadWatcher object is registerd.
-  static bool IsRegistered(const BrowserThread::ID thread_id);
+  static bool IsRegistered(const content::BrowserThread::ID thread_id);
 
   // This method returns number of responsive and unresponsive watched threads.
   static void GetStatusOfThreads(uint32* responding_thread_count,
@@ -368,7 +368,7 @@ class ThreadWatcherList {
   // This method calls ThreadWatcher::StartWatching() to perform health check on
   // the given |thread_id|.
   static void StartWatching(
-      const BrowserThread::ID& thread_id,
+      const content::BrowserThread::ID& thread_id,
       const std::string& thread_name,
       const base::TimeDelta& sleep_time,
       const base::TimeDelta& unresponsive_time,
@@ -382,7 +382,7 @@ class ThreadWatcherList {
 
   // The Find() method can be used to test to see if a given ThreadWatcher was
   // already registered, or to retrieve a pointer to it from the global map.
-  static ThreadWatcher* Find(const BrowserThread::ID& thread_id);
+  static ThreadWatcher* Find(const content::BrowserThread::ID& thread_id);
 
   // The singleton of this class and is used to keep track of information about
   // threads that are being watched.
diff --git a/chrome/browser/metrics/thread_watcher_unittest.cc b/chrome/browser/metrics/thread_watcher_unittest.cc
index bd95368..aa2bd86 100644
--- a/chrome/browser/metrics/thread_watcher_unittest.cc
+++ b/chrome/browser/metrics/thread_watcher_unittest.cc
@@ -24,6 +24,7 @@
 
 using base::TimeDelta;
 using base::TimeTicks;
+using content::BrowserThread;
 
 enum State {
   INITIALIZED,        // Created ThreadWatch object.
diff --git a/chrome/browser/mock_browsing_data_quota_helper.cc b/chrome/browser/mock_browsing_data_quota_helper.cc
index d1daf51..c032773 100644
--- a/chrome/browser/mock_browsing_data_quota_helper.cc
+++ b/chrome/browser/mock_browsing_data_quota_helper.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/mock_browsing_data_quota_helper.h"
 
+using content::BrowserThread;
+
 MockBrowsingDataQuotaHelper::MockBrowsingDataQuotaHelper(Profile* profile)
     : BrowsingDataQuotaHelper(BrowserThread::GetMessageLoopProxyForThread(
         BrowserThread::IO)) {}
diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc
index ebf3bbf..62a1f41 100644
--- a/chrome/browser/nacl_host/nacl_process_host.cc
+++ b/chrome/browser/nacl_host/nacl_process_host.cc
@@ -32,6 +32,8 @@
 #include "chrome/browser/nacl_host/nacl_broker_service_win.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 #if !defined(DISABLE_NACL)
diff --git a/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc b/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc
index 4eaec72..bafed99 100644
--- a/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc
+++ b/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc
@@ -22,6 +22,7 @@
 #include "net/url_request/url_request.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using net::SSLInfo;
 
 namespace chrome_browser_net {
diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc
index 21e16d7..a276c61 100644
--- a/chrome/browser/net/chrome_network_delegate.cc
+++ b/chrome/browser/net/chrome_network_delegate.cc
@@ -25,6 +25,8 @@
 #include "chrome/browser/policy/url_blacklist_manager.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 // If the |request| failed due to problems with a proxy, forward the error to
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc
index 7f68f33..f425f5c 100644
--- a/chrome/browser/net/chrome_url_request_context.cc
+++ b/chrome/browser/net/chrome_url_request_context.cc
@@ -22,6 +22,8 @@
 #include "net/base/cookie_store.h"
 #include "net/http/http_util.h"
 
+using content::BrowserThread;
+
 class ChromeURLRequestContextFactory {
  public:
   ChromeURLRequestContextFactory() {}
diff --git a/chrome/browser/net/connection_tester_unittest.cc b/chrome/browser/net/connection_tester_unittest.cc
index 53ebe47..b3dd1f3 100644
--- a/chrome/browser/net/connection_tester_unittest.cc
+++ b/chrome/browser/net/connection_tester_unittest.cc
@@ -23,6 +23,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // This is a testing delegate which simply counts how many times each of
diff --git a/chrome/browser/net/cookie_policy_browsertest.cc b/chrome/browser/net/cookie_policy_browsertest.cc
index 2128a15..4f3afac 100644
--- a/chrome/browser/net/cookie_policy_browsertest.cc
+++ b/chrome/browser/net/cookie_policy_browsertest.cc
@@ -18,6 +18,8 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
+using content::BrowserThread;
+
 namespace {
 
 class GetCookiesTask : public Task {
diff --git a/chrome/browser/net/crl_set_fetcher.cc b/chrome/browser/net/crl_set_fetcher.cc
index 66daec5..c658d78 100644
--- a/chrome/browser/net/crl_set_fetcher.cc
+++ b/chrome/browser/net/crl_set_fetcher.cc
@@ -17,6 +17,8 @@
 #include "net/base/crl_set.h"
 #include "net/base/ssl_config_service.h"
 
+using content::BrowserThread;
+
 CRLSetFetcher::CRLSetFetcher() {
 }
 
diff --git a/chrome/browser/net/gaia/token_service.cc b/chrome/browser/net/gaia/token_service.cc
index 24687ac..f1f1507 100644
--- a/chrome/browser/net/gaia/token_service.cc
+++ b/chrome/browser/net/gaia/token_service.cc
@@ -16,6 +16,8 @@
 #include "content/public/browser/notification_source.h"
 #include "net/url_request/url_request_context_getter.h"
 
+using content::BrowserThread;
+
 // Unfortunately kNumServices must be defined in the .h.
 // TODO(chron): Sync doesn't use the TalkToken anymore so we can stop
 //              requesting it.
diff --git a/chrome/browser/net/gaia/token_service_unittest.cc b/chrome/browser/net/gaia/token_service_unittest.cc
index 396873f..4dc88c3 100644
--- a/chrome/browser/net/gaia/token_service_unittest.cc
+++ b/chrome/browser/net/gaia/token_service_unittest.cc
@@ -15,6 +15,8 @@
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "content/test/test_url_fetcher_factory.h"
 
+using content::BrowserThread;
+
 TokenAvailableTracker::TokenAvailableTracker() {}
 
 TokenAvailableTracker::~TokenAvailableTracker() {}
diff --git a/chrome/browser/net/http_server_properties_manager.cc b/chrome/browser/net/http_server_properties_manager.cc
index b421bc3..f36b5e3 100644
--- a/chrome/browser/net/http_server_properties_manager.cc
+++ b/chrome/browser/net/http_server_properties_manager.cc
@@ -13,6 +13,8 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 
+using content::BrowserThread;
+
 namespace chrome_browser_net {
 
 namespace {
diff --git a/chrome/browser/net/http_server_properties_manager_unittest.cc b/chrome/browser/net/http_server_properties_manager_unittest.cc
index 5ce93e9..23fe26d 100644
--- a/chrome/browser/net/http_server_properties_manager_unittest.cc
+++ b/chrome/browser/net/http_server_properties_manager_unittest.cc
@@ -22,6 +22,7 @@ using ::testing::_;
 using ::testing::Invoke;
 using ::testing::Mock;
 using ::testing::StrictMock;
+using content::BrowserThread;
 
 class TestingHttpServerPropertiesManager : public HttpServerPropertiesManager {
  public:
diff --git a/chrome/browser/net/load_timing_observer.cc b/chrome/browser/net/load_timing_observer.cc
index 1d01941..58963cb 100644
--- a/chrome/browser/net/load_timing_observer.cc
+++ b/chrome/browser/net/load_timing_observer.cc
@@ -14,6 +14,7 @@
 
 using base::Time;
 using base::TimeTicks;
+using content::BrowserThread;
 using webkit_glue::ResourceLoaderBridge;
 using webkit_glue::ResourceLoadTimingInfo;
 
diff --git a/chrome/browser/net/load_timing_observer_unittest.cc b/chrome/browser/net/load_timing_observer_unittest.cc
index c255572..f18751b 100644
--- a/chrome/browser/net/load_timing_observer_unittest.cc
+++ b/chrome/browser/net/load_timing_observer_unittest.cc
@@ -15,8 +15,9 @@
 
 namespace {
 
-using net::NetLog;
 using base::TimeDelta;
+using content::BrowserThread;
+using net::NetLog;
 
 // Serves to Identify the current thread as the IO thread.
 class LoadTimingObserverTest : public testing::Test {
diff --git a/chrome/browser/net/net_pref_observer.cc b/chrome/browser/net/net_pref_observer.cc
index c270676..b52f2ec 100644
--- a/chrome/browser/net/net_pref_observer.cc
+++ b/chrome/browser/net/net_pref_observer.cc
@@ -16,6 +16,8 @@
 #include "net/http/http_stream_factory.h"
 #include "net/url_request/url_request_throttler_manager.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Function (for NewRunnableFunction) to call the set_enforce_throttling
diff --git a/chrome/browser/net/network_stats.cc b/chrome/browser/net/network_stats.cc
index 1cbddcf..210bc15 100644
--- a/chrome/browser/net/network_stats.cc
+++ b/chrome/browser/net/network_stats.cc
@@ -24,6 +24,8 @@
 #include "net/udp/udp_client_socket.h"
 #include "net/udp/udp_server_socket.h"
 
+using content::BrowserThread;
+
 namespace chrome_browser_net {
 
 // This specifies the number of bytes to be sent to the TCP/UDP servers as part
diff --git a/chrome/browser/net/preconnect.cc b/chrome/browser/net/preconnect.cc
index ef795e6..a6dcd4b 100644
--- a/chrome/browser/net/preconnect.cc
+++ b/chrome/browser/net/preconnect.cc
@@ -17,6 +17,8 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
+using content::BrowserThread;
+
 namespace chrome_browser_net {
 
 void PreconnectOnUIThread(
diff --git a/chrome/browser/net/predictor.cc b/chrome/browser/net/predictor.cc
index f108bc1..51bc4ae 100644
--- a/chrome/browser/net/predictor.cc
+++ b/chrome/browser/net/predictor.cc
@@ -36,6 +36,7 @@
 #include "net/base/single_request_host_resolver.h"
 
 using base::TimeDelta;
+using content::BrowserThread;
 
 namespace chrome_browser_net {
 
diff --git a/chrome/browser/net/predictor_unittest.cc b/chrome/browser/net/predictor_unittest.cc
index d92775c..19bb21b 100644
--- a/chrome/browser/net/predictor_unittest.cc
+++ b/chrome/browser/net/predictor_unittest.cc
@@ -24,6 +24,7 @@
 
 using base::Time;
 using base::TimeDelta;
+using content::BrowserThread;
 
 namespace chrome_browser_net {
 
diff --git a/chrome/browser/net/pref_proxy_config_service.cc b/chrome/browser/net/pref_proxy_config_service.cc
index d6bb631..a4f578c 100644
--- a/chrome/browser/net/pref_proxy_config_service.cc
+++ b/chrome/browser/net/pref_proxy_config_service.cc
@@ -14,6 +14,8 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 
+using content::BrowserThread;
+
 PrefProxyConfigTracker::PrefProxyConfigTracker(PrefService* pref_service)
     : pref_service_(pref_service) {
   config_state_ = ReadPrefConfig(&pref_config_);
diff --git a/chrome/browser/net/pref_proxy_config_service_unittest.cc b/chrome/browser/net/pref_proxy_config_service_unittest.cc
index ca98763..656b484 100644
--- a/chrome/browser/net/pref_proxy_config_service_unittest.cc
+++ b/chrome/browser/net/pref_proxy_config_service_unittest.cc
@@ -18,6 +18,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using testing::_;
 using testing::Mock;
 
diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc
index dacf99d..a1388db 100644
--- a/chrome/browser/net/proxy_service_factory.cc
+++ b/chrome/browser/net/proxy_service_factory.cc
@@ -22,6 +22,8 @@
 #include "chrome/browser/chromeos/proxy_config_service.h"
 #endif  // defined(OS_CHROMEOS)
 
+using content::BrowserThread;
+
 // static
 net::ProxyConfigService* ProxyServiceFactory::CreateProxyConfigService(
     PrefProxyConfigTracker* proxy_config_tracker) {
diff --git a/chrome/browser/net/sqlite_origin_bound_cert_store.cc b/chrome/browser/net/sqlite_origin_bound_cert_store.cc
index 0d178f9..83d07bd 100644
--- a/chrome/browser/net/sqlite_origin_bound_cert_store.cc
+++ b/chrome/browser/net/sqlite_origin_bound_cert_store.cc
@@ -20,6 +20,8 @@
 #include "sql/statement.h"
 #include "sql/transaction.h"
 
+using content::BrowserThread;
+
 // This class is designed to be shared between any calling threads and the
 // database thread.  It batches operations and commits them on a timer.
 class SQLiteOriginBoundCertStore::Backend
diff --git a/chrome/browser/net/sqlite_origin_bound_cert_store_unittest.cc b/chrome/browser/net/sqlite_origin_bound_cert_store_unittest.cc
index c0606b6..1b68962 100644
--- a/chrome/browser/net/sqlite_origin_bound_cert_store_unittest.cc
+++ b/chrome/browser/net/sqlite_origin_bound_cert_store_unittest.cc
@@ -13,6 +13,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 class SQLiteOriginBoundCertStoreTest : public testing::Test {
  public:
   SQLiteOriginBoundCertStoreTest()
diff --git a/chrome/browser/net/sqlite_persistent_cookie_store.cc b/chrome/browser/net/sqlite_persistent_cookie_store.cc
index 2e58f62..bd2ac81 100644
--- a/chrome/browser/net/sqlite_persistent_cookie_store.cc
+++ b/chrome/browser/net/sqlite_persistent_cookie_store.cc
@@ -30,6 +30,7 @@
 #include "sql/transaction.h"
 
 using base::Time;
+using content::BrowserThread;
 
 // This class is designed to be shared between any calling threads and the
 // database thread. It batches operations and commits them on a timer.
diff --git a/chrome/browser/net/sqlite_persistent_cookie_store_perftest.cc b/chrome/browser/net/sqlite_persistent_cookie_store_perftest.cc
index 8148c21..b3e7d4a 100644
--- a/chrome/browser/net/sqlite_persistent_cookie_store_perftest.cc
+++ b/chrome/browser/net/sqlite_persistent_cookie_store_perftest.cc
@@ -15,6 +15,8 @@
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 class SQLitePersistentCookieStorePerfTest : public testing::Test {
  public:
   SQLitePersistentCookieStorePerfTest()
diff --git a/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc b/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc
index 8db113b..b92a202 100644
--- a/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc
+++ b/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc
@@ -17,6 +17,8 @@
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 class SQLitePersistentCookieStoreTest : public testing::Test {
  public:
   SQLitePersistentCookieStoreTest()
diff --git a/chrome/browser/net/ssl_config_service_manager_pref.cc b/chrome/browser/net/ssl_config_service_manager_pref.cc
index af3683b..f56f5d8 100644
--- a/chrome/browser/net/ssl_config_service_manager_pref.cc
+++ b/chrome/browser/net/ssl_config_service_manager_pref.cc
@@ -20,6 +20,8 @@
 #include "net/base/ssl_cipher_suite_names.h"
 #include "net/base/ssl_config_service.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Converts a ListValue of StringValues into a vector of strings. Any Values
diff --git a/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc b/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc
index 525335b..555f077 100644
--- a/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc
+++ b/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc
@@ -20,6 +20,7 @@
 
 using base::ListValue;
 using base::Value;
+using content::BrowserThread;
 using net::SSLConfig;
 using net::SSLConfigService;
 
diff --git a/chrome/browser/net/url_request_mock_util.cc b/chrome/browser/net/url_request_mock_util.cc
index 026cc2f..42288a7 100644
--- a/chrome/browser/net/url_request_mock_util.cc
+++ b/chrome/browser/net/url_request_mock_util.cc
@@ -17,6 +17,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "net/url_request/url_request_filter.h"
 
+using content::BrowserThread;
+
 namespace chrome_browser_net {
 
 void SetUrlRequestMocksEnabled(bool enabled) {
diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc
index c87d27f..9fae7bd 100644
--- a/chrome/browser/notifications/desktop_notification_service.cc
+++ b/chrome/browser/notifications/desktop_notification_service.cc
@@ -43,6 +43,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+using content::BrowserThread;
 using WebKit::WebNotificationPresenter;
 using WebKit::WebTextDirection;
 
diff --git a/chrome/browser/notifications/desktop_notification_service_factory.cc b/chrome/browser/notifications/desktop_notification_service_factory.cc
index 7de59e6..ec8543a 100644
--- a/chrome/browser/notifications/desktop_notification_service_factory.cc
+++ b/chrome/browser/notifications/desktop_notification_service_factory.cc
@@ -10,6 +10,8 @@
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 // static
 DesktopNotificationService* DesktopNotificationServiceFactory::GetForProfile(
     Profile* profile) {
diff --git a/chrome/browser/notifications/desktop_notification_service_unittest.cc b/chrome/browser/notifications/desktop_notification_service_unittest.cc
index 97af96a..72d9e13 100644
--- a/chrome/browser/notifications/desktop_notification_service_unittest.cc
+++ b/chrome/browser/notifications/desktop_notification_service_unittest.cc
@@ -15,6 +15,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // The HasPermission method of the DesktopNotificationService wants to be called
diff --git a/chrome/browser/notifications/desktop_notifications_unittest.cc b/chrome/browser/notifications/desktop_notifications_unittest.cc
index 1697caf..028cd87 100644
--- a/chrome/browser/notifications/desktop_notifications_unittest.cc
+++ b/chrome/browser/notifications/desktop_notifications_unittest.cc
@@ -11,6 +11,8 @@
 #include "chrome/test/base/testing_pref_service.h"
 #include "content/common/desktop_notification_messages.h"
 
+using content::BrowserThread;
+
 // static
 const int MockBalloonCollection::kMockBalloonSpace = 5;
 
diff --git a/chrome/browser/oom_priority_manager.cc b/chrome/browser/oom_priority_manager.cc
index 6ca3851..1eb6de3 100644
--- a/chrome/browser/oom_priority_manager.cc
+++ b/chrome/browser/oom_priority_manager.cc
@@ -36,6 +36,7 @@ using base::TimeDelta;
 using base::TimeTicks;
 using base::ProcessHandle;
 using base::ProcessMetrics;
+using content::BrowserThread;
 
 namespace {
 
diff --git a/chrome/browser/password_manager/native_backend_gnome_x.cc b/chrome/browser/password_manager/native_backend_gnome_x.cc
index 665852c..9b73f05 100644
--- a/chrome/browser/password_manager/native_backend_gnome_x.cc
+++ b/chrome/browser/password_manager/native_backend_gnome_x.cc
@@ -21,6 +21,7 @@
 #include "base/utf_string_conversions.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
 using webkit_glue::PasswordForm;
 
 #define GNOME_KEYRING_DEFINE_POINTER(name) \
diff --git a/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc b/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc
index 552ea13..ec57fcd 100644
--- a/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc
+++ b/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc
@@ -17,6 +17,7 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using webkit_glue::PasswordForm;
 
 namespace {
diff --git a/chrome/browser/password_manager/native_backend_kwallet_x.cc b/chrome/browser/password_manager/native_backend_kwallet_x.cc
index 1bf6df3..507d952 100644
--- a/chrome/browser/password_manager/native_backend_kwallet_x.cc
+++ b/chrome/browser/password_manager/native_backend_kwallet_x.cc
@@ -19,6 +19,7 @@
 #include "grit/chromium_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
 using webkit_glue::PasswordForm;
 
 // We could localize this string, but then changing your locale would cause
diff --git a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc
index 89bde93..9deec48 100644
--- a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc
+++ b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc
@@ -24,6 +24,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using testing::_;
 using testing::Invoke;
 using testing::Return;
diff --git a/chrome/browser/password_manager/password_manager_unittest.cc b/chrome/browser/password_manager/password_manager_unittest.cc
index 10d30ba..5b7cc70 100644
--- a/chrome/browser/password_manager/password_manager_unittest.cc
+++ b/chrome/browser/password_manager/password_manager_unittest.cc
@@ -18,6 +18,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using webkit_glue::PasswordForm;
 using testing::_;
 using testing::DoAll;
diff --git a/chrome/browser/password_manager/password_store.cc b/chrome/browser/password_manager/password_store.cc
index 8643281..3127170 100644
--- a/chrome/browser/password_manager/password_store.cc
+++ b/chrome/browser/password_manager/password_store.cc
@@ -12,6 +12,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "webkit/glue/password_form.h"
 
+using content::BrowserThread;
 using std::vector;
 using webkit_glue::PasswordForm;
 
diff --git a/chrome/browser/password_manager/password_store_default.cc b/chrome/browser/password_manager/password_store_default.cc
index fc94580..0931f31 100644
--- a/chrome/browser/password_manager/password_store_default.cc
+++ b/chrome/browser/password_manager/password_store_default.cc
@@ -18,6 +18,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 
+using content::BrowserThread;
 using webkit_glue::PasswordForm;
 
 // MigrateHelper handles migration from WebDB to PasswordStore. It runs
diff --git a/chrome/browser/password_manager/password_store_default_unittest.cc b/chrome/browser/password_manager/password_store_default_unittest.cc
index c5b71c3..ee3f832 100644
--- a/chrome/browser/password_manager/password_store_default_unittest.cc
+++ b/chrome/browser/password_manager/password_store_default_unittest.cc
@@ -28,6 +28,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::WaitableEvent;
+using content::BrowserThread;
 using testing::_;
 using testing::DoAll;
 using testing::ElementsAreArray;
diff --git a/chrome/browser/password_manager/password_store_mac_unittest.cc b/chrome/browser/password_manager/password_store_mac_unittest.cc
index 76603da..dd49063 100644
--- a/chrome/browser/password_manager/password_store_mac_unittest.cc
+++ b/chrome/browser/password_manager/password_store_mac_unittest.cc
@@ -19,6 +19,7 @@
 #include "chrome/common/chrome_paths.h"
 #include "content/test/test_browser_thread.h"
 
+using content::BrowserThread;
 using webkit_glue::PasswordForm;
 using testing::_;
 using testing::DoAll;
diff --git a/chrome/browser/password_manager/password_store_win.cc b/chrome/browser/password_manager/password_store_win.cc
index a1100fc..2bbe344 100644
--- a/chrome/browser/password_manager/password_store_win.cc
+++ b/chrome/browser/password_manager/password_store_win.cc
@@ -14,6 +14,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/webdata/web_data_service.h"
 
+using content::BrowserThread;
 using webkit_glue::PasswordForm;
 
 namespace {
diff --git a/chrome/browser/password_manager/password_store_win_unittest.cc b/chrome/browser/password_manager/password_store_win_unittest.cc
index 452b0ca..3881bff 100644
--- a/chrome/browser/password_manager/password_store_win_unittest.cc
+++ b/chrome/browser/password_manager/password_store_win_unittest.cc
@@ -27,6 +27,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::WaitableEvent;
+using content::BrowserThread;
 using testing::_;
 using testing::DoAll;
 using testing::WithArg;
diff --git a/chrome/browser/password_manager/password_store_x.cc b/chrome/browser/password_manager/password_store_x.cc
index b55a15f..94b27bc 100644
--- a/chrome/browser/password_manager/password_store_x.cc
+++ b/chrome/browser/password_manager/password_store_x.cc
@@ -18,6 +18,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 
+using content::BrowserThread;
 using std::vector;
 using webkit_glue::PasswordForm;
 
diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc
index ff4317d..a2df5ea 100644
--- a/chrome/browser/password_manager/password_store_x_unittest.cc
+++ b/chrome/browser/password_manager/password_store_x_unittest.cc
@@ -33,6 +33,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::WaitableEvent;
+using content::BrowserThread;
 using testing::_;
 using testing::DoAll;
 using testing::ElementsAreArray;
diff --git a/chrome/browser/platform_util_chromeos.cc b/chrome/browser/platform_util_chromeos.cc
index 68fd528..238c545 100644
--- a/chrome/browser/platform_util_chromeos.cc
+++ b/chrome/browser/platform_util_chromeos.cc
@@ -16,6 +16,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 
+using content::BrowserThread;
+
 class Profile;
 
 namespace platform_util {
diff --git a/chrome/browser/plugin_data_remover.cc b/chrome/browser/plugin_data_remover.cc
index c7106ac..592cf46 100644
--- a/chrome/browser/plugin_data_remover.cc
+++ b/chrome/browser/plugin_data_remover.cc
@@ -22,6 +22,8 @@
 #include "ipc/ipc_channel_posix.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 const char kFlashMimeType[] = "application/x-shockwave-flash";
diff --git a/chrome/browser/plugin_data_remover_helper.cc b/chrome/browser/plugin_data_remover_helper.cc
index 24d238c..f6ccc02 100644
--- a/chrome/browser/plugin_data_remover_helper.cc
+++ b/chrome/browser/plugin_data_remover_helper.cc
@@ -16,6 +16,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_source.h"
 
+using content::BrowserThread;
+
 PluginDataRemoverHelper::PluginDataRemoverHelper()
     : profile_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(factory_(this)) {}
diff --git a/chrome/browser/plugin_prefs.cc b/chrome/browser/plugin_prefs.cc
index f1ed730..c20886e 100644
--- a/chrome/browser/plugin_prefs.cc
+++ b/chrome/browser/plugin_prefs.cc
@@ -35,6 +35,8 @@
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/webplugininfo.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Default state for a plug-in (not state of the default plug-in!).
diff --git a/chrome/browser/plugin_prefs_unittest.cc b/chrome/browser/plugin_prefs_unittest.cc
index 4dbb1bf..20acd5e 100644
--- a/chrome/browser/plugin_prefs_unittest.cc
+++ b/chrome/browser/plugin_prefs_unittest.cc
@@ -13,6 +13,8 @@
 #include "webkit/plugins/npapi/mock_plugin_list.cc"
 #include "webkit/plugins/webplugininfo.h"
 
+using content::BrowserThread;
+
 class PluginPrefsTest : public ::testing::Test {
  public:
   virtual void SetUp() OVERRIDE {
diff --git a/chrome/browser/policy/asynchronous_policy_loader.cc b/chrome/browser/policy/asynchronous_policy_loader.cc
index a31babf..5c45042 100644
--- a/chrome/browser/policy/asynchronous_policy_loader.cc
+++ b/chrome/browser/policy/asynchronous_policy_loader.cc
@@ -8,6 +8,8 @@
 #include "base/message_loop.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace policy {
 
 AsynchronousPolicyLoader::AsynchronousPolicyLoader(
diff --git a/chrome/browser/policy/asynchronous_policy_test_base.cc b/chrome/browser/policy/asynchronous_policy_test_base.cc
index c7d9490..50510ec 100644
--- a/chrome/browser/policy/asynchronous_policy_test_base.cc
+++ b/chrome/browser/policy/asynchronous_policy_test_base.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/policy/asynchronous_policy_test_base.h"
 
+using content::BrowserThread;
+
 namespace policy {
 
 ProviderDelegateMock::ProviderDelegateMock()
diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
index 3930466..6ca79b4 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -40,6 +40,8 @@
 #include "chrome/browser/policy/device_policy_cache.h"
 #endif
 
+using content::BrowserThread;
+
 namespace policy {
 
 namespace {
diff --git a/chrome/browser/policy/cloud_policy_controller_unittest.cc b/chrome/browser/policy/cloud_policy_controller_unittest.cc
index a110629..68d57bd 100644
--- a/chrome/browser/policy/cloud_policy_controller_unittest.cc
+++ b/chrome/browser/policy/cloud_policy_controller_unittest.cc
@@ -24,6 +24,7 @@ namespace policy {
 using ::testing::AnyNumber;
 using ::testing::InSequence;
 using ::testing::_;
+using content::BrowserThread;
 
 class MockDeviceTokenFetcher : public DeviceTokenFetcher {
  public:
diff --git a/chrome/browser/policy/cloud_policy_subsystem_unittest.cc b/chrome/browser/policy/cloud_policy_subsystem_unittest.cc
index 1f80df0..c27313d 100644
--- a/chrome/browser/policy/cloud_policy_subsystem_unittest.cc
+++ b/chrome/browser/policy/cloud_policy_subsystem_unittest.cc
@@ -28,6 +28,7 @@ namespace policy {
 using ::testing::_;
 using ::testing::AtMost;
 using ::testing::InSequence;
+using content::BrowserThread;
 
 namespace em = enterprise_management;
 
diff --git a/chrome/browser/policy/config_dir_policy_provider_unittest.cc b/chrome/browser/policy/config_dir_policy_provider_unittest.cc
index a3cb1a8c..bb71813 100644
--- a/chrome/browser/policy/config_dir_policy_provider_unittest.cc
+++ b/chrome/browser/policy/config_dir_policy_provider_unittest.cc
@@ -16,6 +16,8 @@
 #include "policy/policy_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace policy {
 
 template<typename BASE>
diff --git a/chrome/browser/policy/configuration_policy_loader_win.cc b/chrome/browser/policy/configuration_policy_loader_win.cc
index dfc10d8..49b1053 100644
--- a/chrome/browser/policy/configuration_policy_loader_win.cc
+++ b/chrome/browser/policy/configuration_policy_loader_win.cc
@@ -11,6 +11,8 @@
 // userenv.dll is required for RegisterGPNotification().
 #pragma comment(lib, "userenv.lib")
 
+using content::BrowserThread;
+
 namespace policy {
 
 ConfigurationPolicyLoaderWin::ConfigurationPolicyLoaderWin(
diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc
index aee5d88..3a22310 100644
--- a/chrome/browser/policy/configuration_policy_pref_store.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store.cc
@@ -20,6 +20,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "policy/policy_constants.h"
 
+using content::BrowserThread;
+
 namespace policy {
 
 namespace {
diff --git a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
index 18dcc48..dc03bdb 100644
--- a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
@@ -22,6 +22,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::win::RegKey;
+using content::BrowserThread;
 
 namespace policy {
 
diff --git a/chrome/browser/policy/device_management_service.cc b/chrome/browser/policy/device_management_service.cc
index 1bd6e83..e2983d7 100644
--- a/chrome/browser/policy/device_management_service.cc
+++ b/chrome/browser/policy/device_management_service.cc
@@ -26,6 +26,8 @@
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
+using content::BrowserThread;
+
 namespace policy {
 
 namespace {
diff --git a/chrome/browser/policy/device_management_service_unittest.cc b/chrome/browser/policy/device_management_service_unittest.cc
index df5e3bc3..34c585f 100644
--- a/chrome/browser/policy/device_management_service_unittest.cc
+++ b/chrome/browser/policy/device_management_service_unittest.cc
@@ -23,6 +23,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using testing::IgnoreResult;
 using testing::InvokeWithoutArgs;
 using testing::_;
diff --git a/chrome/browser/policy/device_token_fetcher_unittest.cc b/chrome/browser/policy/device_token_fetcher_unittest.cc
index 562ae68..f3f5fbe 100644
--- a/chrome/browser/policy/device_token_fetcher_unittest.cc
+++ b/chrome/browser/policy/device_token_fetcher_unittest.cc
@@ -21,6 +21,7 @@ namespace policy {
 
 const char kTestToken[] = "device_token_fetcher_test_auth_token";
 
+using content::BrowserThread;
 using testing::_;
 using testing::AnyNumber;
 using testing::Mock;
diff --git a/chrome/browser/policy/enterprise_metrics_browsertest.cc b/chrome/browser/policy/enterprise_metrics_browsertest.cc
index dd968fb..658ea54 100644
--- a/chrome/browser/policy/enterprise_metrics_browsertest.cc
+++ b/chrome/browser/policy/enterprise_metrics_browsertest.cc
@@ -40,6 +40,7 @@ namespace policy {
 
 namespace em = enterprise_management;
 
+using content::BrowserThread;
 using testing::AnyNumber;
 using testing::DoAll;
 using testing::Invoke;
diff --git a/chrome/browser/policy/file_based_policy_loader.cc b/chrome/browser/policy/file_based_policy_loader.cc
index 7f9a0ae..c7a8691 100644
--- a/chrome/browser/policy/file_based_policy_loader.cc
+++ b/chrome/browser/policy/file_based_policy_loader.cc
@@ -10,6 +10,7 @@
 #include "content/public/browser/browser_thread.h"
 
 using ::base::files::FilePathWatcher;
+using content::BrowserThread;
 
 namespace {
 
diff --git a/chrome/browser/policy/logging_work_scheduler.cc b/chrome/browser/policy/logging_work_scheduler.cc
index 6947172..841df96 100644
--- a/chrome/browser/policy/logging_work_scheduler.cc
+++ b/chrome/browser/policy/logging_work_scheduler.cc
@@ -10,6 +10,8 @@
 #include "base/message_loop.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace policy {
 
 // Objects of this class are used in the priority-queue of future tasks
diff --git a/chrome/browser/policy/logging_work_scheduler_unittest.cc b/chrome/browser/policy/logging_work_scheduler_unittest.cc
index 6406a1c..bb77738 100644
--- a/chrome/browser/policy/logging_work_scheduler_unittest.cc
+++ b/chrome/browser/policy/logging_work_scheduler_unittest.cc
@@ -11,6 +11,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace policy {
 
 class LoggingWorkSchedulerTest : public testing::Test {
diff --git a/chrome/browser/policy/url_blacklist_manager.cc b/chrome/browser/policy/url_blacklist_manager.cc
index 59a0e13..66082bf 100644
--- a/chrome/browser/policy/url_blacklist_manager.cc
+++ b/chrome/browser/policy/url_blacklist_manager.cc
@@ -17,6 +17,8 @@
 #include "content/public/browser/notification_source.h"
 #include "googleurl/src/gurl.h"
 
+using content::BrowserThread;
+
 namespace policy {
 
 namespace {
diff --git a/chrome/browser/policy/url_blacklist_manager_unittest.cc b/chrome/browser/policy/url_blacklist_manager_unittest.cc
index 24a6d05..647058e 100644
--- a/chrome/browser/policy/url_blacklist_manager_unittest.cc
+++ b/chrome/browser/policy/url_blacklist_manager_unittest.cc
@@ -22,6 +22,7 @@ namespace {
 using ::testing::_;
 using ::testing::Invoke;
 using ::testing::Mock;
+using content::BrowserThread;
 
 class TestingURLBlacklistManager : public URLBlacklistManager {
  public:
diff --git a/chrome/browser/policy/user_policy_cache_unittest.cc b/chrome/browser/policy/user_policy_cache_unittest.cc
index 50a3bfc..3d48565 100644
--- a/chrome/browser/policy/user_policy_cache_unittest.cc
+++ b/chrome/browser/policy/user_policy_cache_unittest.cc
@@ -19,6 +19,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using testing::_;
 
 namespace policy {
diff --git a/chrome/browser/policy/user_policy_disk_cache.cc b/chrome/browser/policy/user_policy_disk_cache.cc
index efb8734..dc0ab0f 100644
--- a/chrome/browser/policy/user_policy_disk_cache.cc
+++ b/chrome/browser/policy/user_policy_disk_cache.cc
@@ -12,6 +12,8 @@
 #include "chrome/browser/policy/proto/device_management_local.pb.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Other places can sample on the same UMA counter, so make sure they all do
diff --git a/chrome/browser/policy/user_policy_token_cache.cc b/chrome/browser/policy/user_policy_token_cache.cc
index dab3302..64ab1d7 100644
--- a/chrome/browser/policy/user_policy_token_cache.cc
+++ b/chrome/browser/policy/user_policy_token_cache.cc
@@ -11,6 +11,8 @@
 #include "chrome/browser/policy/proto/device_management_local.pb.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Other places can sample on the same UMA counter, so make sure they all do
diff --git a/chrome/browser/prefs/pref_member.cc b/chrome/browser/prefs/pref_member.cc
index d700939..025138e 100644
--- a/chrome/browser/prefs/pref_member.cc
+++ b/chrome/browser/prefs/pref_member.cc
@@ -10,6 +10,8 @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_notification_types.h"
 
+using content::BrowserThread;
+
 namespace subtle {
 
 PrefMemberBase::PrefMemberBase()
diff --git a/chrome/browser/prefs/pref_member.h b/chrome/browser/prefs/pref_member.h
index 5775db3..bb3434f 100644
--- a/chrome/browser/prefs/pref_member.h
+++ b/chrome/browser/prefs/pref_member.h
@@ -49,7 +49,7 @@ class PrefMemberBase : public content::NotificationObserver {
     // Takes ownership of |value|.
     virtual void UpdateValue(base::Value* value, bool is_managed) const;
 
-    void MoveToThread(BrowserThread::ID thread_id);
+    void MoveToThread(content::BrowserThread::ID thread_id);
 
     // See PrefMember<> for description.
     bool IsManaged() const {
@@ -71,7 +71,7 @@ class PrefMemberBase : public content::NotificationObserver {
 
     bool IsOnCorrectThread() const;
 
-    BrowserThread::ID thread_id_;
+    content::BrowserThread::ID thread_id_;
     mutable bool is_managed_;
 
     DISALLOW_COPY_AND_ASSIGN(Internal);
@@ -89,7 +89,7 @@ class PrefMemberBase : public content::NotificationObserver {
   // See PrefMember<> for description.
   void Destroy();
 
-  void MoveToThread(BrowserThread::ID thread_id);
+  void MoveToThread(content::BrowserThread::ID thread_id);
 
   // content::NotificationObserver
   virtual void Observe(int type,
@@ -155,7 +155,7 @@ class PrefMember : public subtle::PrefMemberBase {
   // via PostTask.
   // This method should only be used from the thread the PrefMember is currently
   // on, which is the UI thread by default.
-  void MoveToThread(BrowserThread::ID thread_id) {
+  void MoveToThread(content::BrowserThread::ID thread_id) {
     subtle::PrefMemberBase::MoveToThread(thread_id);
   }
 
diff --git a/chrome/browser/prefs/pref_member_unittest.cc b/chrome/browser/prefs/pref_member_unittest.cc
index 15c5a21..7cefce7 100644
--- a/chrome/browser/prefs/pref_member_unittest.cc
+++ b/chrome/browser/prefs/pref_member_unittest.cc
@@ -13,6 +13,9 @@
 #include "content/public/browser/notification_source.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
+
+using content::BrowserThread;
+
 namespace {
 
 const char kBoolPref[] = "bool";
diff --git a/chrome/browser/prefs/pref_service.cc b/chrome/browser/prefs/pref_service.cc
index 5ab4651..3050a17 100644
--- a/chrome/browser/prefs/pref_service.cc
+++ b/chrome/browser/prefs/pref_service.cc
@@ -35,6 +35,8 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // A helper function for RegisterLocalized*Pref that creates a Value* based on
diff --git a/chrome/browser/prefs/pref_service_mock_builder.cc b/chrome/browser/prefs/pref_service_mock_builder.cc
index 133609f..c4916cb 100644
--- a/chrome/browser/prefs/pref_service_mock_builder.cc
+++ b/chrome/browser/prefs/pref_service_mock_builder.cc
@@ -12,6 +12,8 @@
 #include "chrome/common/json_pref_store.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 PrefServiceMockBuilder::PrefServiceMockBuilder()
   : user_prefs_(new TestingPrefStore) {
 }
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index 2d41228..5aecde4 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -44,6 +44,8 @@
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 // Prerender tests work as follows:
 //
 // A page with a prefetch link to the test page is loaded.  Once prerendered,
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc
index 0af29b6..f864823 100644
--- a/chrome/browser/prerender/prerender_manager.cc
+++ b/chrome/browser/prerender/prerender_manager.cc
@@ -45,6 +45,8 @@
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 
+using content::BrowserThread;
+
 namespace prerender {
 
 namespace {
diff --git a/chrome/browser/prerender/prerender_manager_unittest.cc b/chrome/browser/prerender/prerender_manager_unittest.cc
index 28cf9f0..a83fb98 100644
--- a/chrome/browser/prerender/prerender_manager_unittest.cc
+++ b/chrome/browser/prerender/prerender_manager_unittest.cc
@@ -14,6 +14,8 @@
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace prerender {
 
 namespace {
diff --git a/chrome/browser/prerender/prerender_tracker.cc b/chrome/browser/prerender/prerender_tracker.cc
index 893744a..62122a1 100644
--- a/chrome/browser/prerender/prerender_tracker.cc
+++ b/chrome/browser/prerender/prerender_tracker.cc
@@ -15,6 +15,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "net/base/load_flags.h"
 
+using content::BrowserThread;
+
 namespace prerender {
 
 namespace {
diff --git a/chrome/browser/prerender/prerender_tracker_unittest.cc b/chrome/browser/prerender/prerender_tracker_unittest.cc
index 7399264..e1e6b2e 100644
--- a/chrome/browser/prerender/prerender_tracker_unittest.cc
+++ b/chrome/browser/prerender/prerender_tracker_unittest.cc
@@ -11,6 +11,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace prerender {
 
 namespace {
diff --git a/chrome/browser/printing/background_printing_manager.cc b/chrome/browser/printing/background_printing_manager.cc
index d81c15f..fc69730 100644
--- a/chrome/browser/printing/background_printing_manager.cc
+++ b/chrome/browser/printing/background_printing_manager.cc
@@ -16,6 +16,8 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 
+using content::BrowserThread;
+
 namespace printing {
 
 BackgroundPrintingManager::BackgroundPrintingManager() {
diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc
index 325a030..cebec21 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc
+++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc
@@ -26,6 +26,8 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 // TODO(sanjeevr): Localize the product name?
 const char kCloudPrintProductName[] = "Google Cloud Print";
 
diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc
index 4d1db8f..e0c7447 100644
--- a/chrome/browser/printing/print_dialog_cloud.cc
+++ b/chrome/browser/printing/print_dialog_cloud.cc
@@ -101,6 +101,8 @@
 // high-level flow (where the data is generated before even
 // bringing up the dialog) isn't what we want.
 
+using content::BrowserThread;
+
 namespace internal_cloud_print_helpers {
 
 // From the JSON parsed value, get the entries for the page setup
diff --git a/chrome/browser/printing/print_dialog_cloud_uitest.cc b/chrome/browser/printing/print_dialog_cloud_uitest.cc
index be77910..7982701 100644
--- a/chrome/browser/printing/print_dialog_cloud_uitest.cc
+++ b/chrome/browser/printing/print_dialog_cloud_uitest.cc
@@ -30,6 +30,8 @@
 #include "net/url_request/url_request_test_job.h"
 #include "net/url_request/url_request_test_util.h"
 
+using content::BrowserThread;
+
 namespace {
 
 class TestData {
diff --git a/chrome/browser/printing/print_dialog_cloud_unittest.cc b/chrome/browser/printing/print_dialog_cloud_unittest.cc
index 463ae7a..3bb0792 100644
--- a/chrome/browser/printing/print_dialog_cloud_unittest.cc
+++ b/chrome/browser/printing/print_dialog_cloud_unittest.cc
@@ -26,6 +26,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using testing::A;
 using testing::AtLeast;
 using testing::Eq;
diff --git a/chrome/browser/printing/print_dialog_gtk.cc b/chrome/browser/printing/print_dialog_gtk.cc
index a5d053e..7f43c74 100644
--- a/chrome/browser/printing/print_dialog_gtk.cc
+++ b/chrome/browser/printing/print_dialog_gtk.cc
@@ -24,6 +24,7 @@
 #include "printing/print_settings.h"
 #include "printing/print_settings_initializer_gtk.h"
 
+using content::BrowserThread;
 using printing::PageRanges;
 using printing::PrintSettings;
 
diff --git a/chrome/browser/printing/print_dialog_gtk.h b/chrome/browser/printing/print_dialog_gtk.h
index 7b95255..55dbb95 100644
--- a/chrome/browser/printing/print_dialog_gtk.h
+++ b/chrome/browser/printing/print_dialog_gtk.h
@@ -28,8 +28,8 @@ using printing::PrintingContextCairo;
 // Needs to be freed on the UI thread to clean up its GTK members variables.
 class PrintDialogGtk
     : public printing::PrintDialogGtkInterface,
-      public base::RefCountedThreadSafe<PrintDialogGtk,
-                                        BrowserThread::DeleteOnUIThread> {
+      public base::RefCountedThreadSafe<
+          PrintDialogGtk, content::BrowserThread::DeleteOnUIThread> {
  public:
   // Creates and returns a print dialog.
   static printing::PrintDialogGtkInterface* CreatePrintDialog(
@@ -48,7 +48,8 @@ class PrintDialogGtk
   virtual void ReleaseDialog() OVERRIDE;
 
  private:
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
+  friend struct content::BrowserThread::DeleteOnThread<
+      content::BrowserThread::UI>;
   friend class DeleteTask<PrintDialogGtk>;
 
   explicit PrintDialogGtk(PrintingContextCairo* context);
diff --git a/chrome/browser/printing/print_job_manager.cc b/chrome/browser/printing/print_job_manager.cc
index 7f4d105..8a22a75 100644
--- a/chrome/browser/printing/print_job_manager.cc
+++ b/chrome/browser/printing/print_job_manager.cc
@@ -14,6 +14,8 @@
 #include "printing/printed_document.h"
 #include "printing/printed_page.h"
 
+using content::BrowserThread;
+
 namespace printing {
 
 PrintJobManager::PrintJobManager() {
diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
index 4311680..19e967b 100644
--- a/chrome/browser/printing/print_job_worker.cc
+++ b/chrome/browser/printing/print_job_worker.cc
@@ -15,6 +15,8 @@
 #include "printing/printed_document.h"
 #include "printing/printed_page.h"
 
+using content::BrowserThread;
+
 namespace printing {
 
 class PrintJobWorker::NotificationTask : public Task {
diff --git a/chrome/browser/printing/print_preview_message_handler.cc b/chrome/browser/printing/print_preview_message_handler.cc
index 51d9956..802db6a 100644
--- a/chrome/browser/printing/print_preview_message_handler.cc
+++ b/chrome/browser/printing/print_preview_message_handler.cc
@@ -26,6 +26,8 @@
 #include "printing/page_size_margins.h"
 #include "printing/print_job_constants.h"
 
+using content::BrowserThread;
+
 namespace {
 
 void StopWorker(int document_cookie) {
diff --git a/chrome/browser/printing/print_system_task_proxy.cc b/chrome/browser/printing/print_system_task_proxy.cc
index e85e0fe..c7787ce 100644
--- a/chrome/browser/printing/print_system_task_proxy.cc
+++ b/chrome/browser/printing/print_system_task_proxy.cc
@@ -110,6 +110,8 @@ void mark_lpoptions(const std::string& printer_name, ppd_file_t** ppd) {
 }  // printing_internal namespace
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 const char kDisableColorOption[] = "disableColorOption";
diff --git a/chrome/browser/printing/print_system_task_proxy.h b/chrome/browser/printing/print_system_task_proxy.h
index 5158754..512a7bb 100644
--- a/chrome/browser/printing/print_system_task_proxy.h
+++ b/chrome/browser/printing/print_system_task_proxy.h
@@ -37,8 +37,8 @@ void parse_lpoptions(const FilePath& filepath, const std::string& printer_name,
 #endif
 
 class PrintSystemTaskProxy
-    : public base::RefCountedThreadSafe<PrintSystemTaskProxy,
-                                        BrowserThread::DeleteOnUIThread> {
+    : public base::RefCountedThreadSafe<
+          PrintSystemTaskProxy, content::BrowserThread::DeleteOnUIThread> {
  public:
   PrintSystemTaskProxy(const base::WeakPtr<PrintPreviewHandler>& handler,
                        printing::PrintBackend* print_backend,
@@ -51,7 +51,8 @@ class PrintSystemTaskProxy
   void GetPrinterCapabilities(const std::string& printer_name);
 
  private:
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
+  friend struct content::BrowserThread::DeleteOnThread<
+      content::BrowserThread::UI>;
   friend class DeleteTask<PrintSystemTaskProxy>;
 
   void SendDefaultPrinter(const base::StringValue* default_printer,
diff --git a/chrome/browser/printing/print_view_manager.cc b/chrome/browser/printing/print_view_manager.cc
index f6498b8..6d4ddcd 100644
--- a/chrome/browser/printing/print_view_manager.cc
+++ b/chrome/browser/printing/print_view_manager.cc
@@ -29,6 +29,7 @@
 #include "ui/base/l10n/l10n_util.h"
 
 using base::TimeDelta;
+using content::BrowserThread;
 
 namespace {
 
diff --git a/chrome/browser/printing/printer_manager_dialog_linux.cc b/chrome/browser/printing/printer_manager_dialog_linux.cc
index c38e578..6ef3f60 100644
--- a/chrome/browser/printing/printer_manager_dialog_linux.cc
+++ b/chrome/browser/printing/printer_manager_dialog_linux.cc
@@ -11,6 +11,7 @@
 #include "content/public/browser/browser_thread.h"
 
 using base::Environment;
+using content::BrowserThread;
 
 namespace {
 
diff --git a/chrome/browser/printing/printing_message_filter.cc b/chrome/browser/printing/printing_message_filter.cc
index c35d68c..fbf75fc 100644
--- a/chrome/browser/printing/printing_message_filter.cc
+++ b/chrome/browser/printing/printing_message_filter.cc
@@ -26,6 +26,8 @@
 #include "chrome/common/chrome_switches.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 #if defined(OS_CHROMEOS)
diff --git a/chrome/browser/printing/printing_message_filter.h b/chrome/browser/printing/printing_message_filter.h
index 926ae65..e257370 100644
--- a/chrome/browser/printing/printing_message_filter.h
+++ b/chrome/browser/printing/printing_message_filter.h
@@ -33,7 +33,7 @@ class PrintingMessageFilter : 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);
 
diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc
index 38d012e..65d3567 100644
--- a/chrome/browser/process_singleton_linux.cc
+++ b/chrome/browser/process_singleton_linux.cc
@@ -95,6 +95,8 @@
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 const int ProcessSingleton::kTimeoutInSeconds;
 
 namespace {
diff --git a/chrome/browser/profiles/avatar_menu_model.cc b/chrome/browser/profiles/avatar_menu_model.cc
index a41e764..a8f3472 100644
--- a/chrome/browser/profiles/avatar_menu_model.cc
+++ b/chrome/browser/profiles/avatar_menu_model.cc
@@ -22,6 +22,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/image/image.h"
 
+using content::BrowserThread;
+
 namespace {
 
 class ProfileSwitchObserver : public ProfileManagerObserver {
diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc
index 58486eb..70214c1 100644
--- a/chrome/browser/profiles/off_the_record_profile_impl.cc
+++ b/chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -63,6 +63,8 @@
 #include "chrome/browser/chromeos/preferences.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 void NotifyOTRProfileCreatedOnIOThread(void* original_profile,
diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.cc b/chrome/browser/profiles/off_the_record_profile_io_data.cc
index 4fb8e2d..93e232d 100644
--- a/chrome/browser/profiles/off_the_record_profile_io_data.cc
+++ b/chrome/browser/profiles/off_the_record_profile_io_data.cc
@@ -26,6 +26,8 @@
 #include "net/http/http_server_properties_impl.h"
 #include "webkit/database/database_tracker.h"
 
+using content::BrowserThread;
+
 OffTheRecordProfileIOData::Handle::Handle(Profile* profile)
     : io_data_(new OffTheRecordProfileIOData),
       profile_(profile),
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 24b3ed1..8c886cf 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -141,6 +141,7 @@
 
 using base::Time;
 using base::TimeDelta;
+using content::BrowserThread;
 
 namespace {
 
diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc
index efff4da..f0ada49 100644
--- a/chrome/browser/profiles/profile_impl_io_data.cc
+++ b/chrome/browser/profiles/profile_impl_io_data.cc
@@ -30,6 +30,8 @@
 #include "net/http/http_cache.h"
 #include "net/url_request/url_request_job_factory.h"
 
+using content::BrowserThread;
+
 namespace {
 
 void ClearNetworkingHistorySinceOnIOThread(
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index d198ae5..016e1da 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -71,6 +71,8 @@
 #include "chrome/browser/chromeos/gview_request_interceptor.h"
 #endif  // defined(OS_CHROMEOS)
 
+using content::BrowserThread;
+
 namespace {
 
 // ----------------------------------------------------------------------------
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index f6486a8..055f9f7 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -47,6 +47,8 @@
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 // Profiles that should be deleted on shutdown.
diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc
index 53d7269..abbb572 100644
--- a/chrome/browser/profiles/profile_manager_unittest.cc
+++ b/chrome/browser/profiles/profile_manager_unittest.cc
@@ -35,6 +35,8 @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 // This global variable is used to check that value returned to different
 // observers is the same.
diff --git a/chrome/browser/protector/protector.cc b/chrome/browser/protector/protector.cc
index df21493..7fe1320 100644
--- a/chrome/browser/protector/protector.cc
+++ b/chrome/browser/protector/protector.cc
@@ -16,6 +16,8 @@
 #include "content/public/browser/notification_source.h"
 #include "crypto/hmac.h"
 
+using content::BrowserThread;
+
 namespace protector {
 
 Protector::Protector(Profile* profile)
diff --git a/chrome/browser/protector/settings_change_global_error.cc b/chrome/browser/protector/settings_change_global_error.cc
index 113f29c..037c095 100644
--- a/chrome/browser/protector/settings_change_global_error.cc
+++ b/chrome/browser/protector/settings_change_global_error.cc
@@ -19,6 +19,8 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 namespace protector {
 
 namespace {
diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.cc b/chrome/browser/renderer_host/chrome_render_message_filter.cc
index a00d31e..42342ef 100644
--- a/chrome/browser/renderer_host/chrome_render_message_filter.cc
+++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc
@@ -52,6 +52,7 @@
 #include "chrome/installer/util/google_update_settings.h"
 #endif
 
+using content::BrowserThread;
 using WebKit::WebCache;
 using WebKit::WebSecurityOrigin;
 
diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.h b/chrome/browser/renderer_host/chrome_render_message_filter.h
index 04e260a..8a3c4c5 100644
--- a/chrome/browser/renderer_host/chrome_render_message_filter.h
+++ b/chrome/browser/renderer_host/chrome_render_message_filter.h
@@ -44,10 +44,10 @@ class ChromeRenderMessageFilter : public BrowserMessageFilter {
                                  bool* message_was_ok);
   virtual void OnDestruct() const;
   virtual void OverrideThreadForMessage(const IPC::Message& message,
-                                        BrowserThread::ID* thread);
+                                        content::BrowserThread::ID* thread);
 
  private:
-  friend class BrowserThread;
+  friend class content::BrowserThread;
   friend class DeleteTask<ChromeRenderMessageFilter>;
 
   struct GetPluginInfo_Params;
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
index c8727a0..9a6b9f7c 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
@@ -40,6 +40,8 @@
 #include "chrome/browser/renderer_host/offline_resource_handler.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 // Empty ResourceDispatcherHostLoginDelegate implementation used for instant.
diff --git a/chrome/browser/renderer_host/offline_resource_handler.cc b/chrome/browser/renderer_host/offline_resource_handler.cc
index fa6ec43..66e4cee 100644
--- a/chrome/browser/renderer_host/offline_resource_handler.cc
+++ b/chrome/browser/renderer_host/offline_resource_handler.cc
@@ -24,6 +24,8 @@
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 
+using content::BrowserThread;
+
 OfflineResourceHandler::OfflineResourceHandler(
     ResourceHandler* handler,
     int host_id,
diff --git a/chrome/browser/renderer_host/web_cache_manager_unittest.cc b/chrome/browser/renderer_host/web_cache_manager_unittest.cc
index 5f59017..29e70d0 100644
--- a/chrome/browser/renderer_host/web_cache_manager_unittest.cc
+++ b/chrome/browser/renderer_host/web_cache_manager_unittest.cc
@@ -11,6 +11,7 @@
 
 using base::Time;
 using base::TimeDelta;
+using content::BrowserThread;
 using WebKit::WebCache;
 
 class WebCacheManagerTest : public testing::Test {
diff --git a/chrome/browser/rlz/rlz.cc b/chrome/browser/rlz/rlz.cc
index c89137d..694e045 100644
--- a/chrome/browser/rlz/rlz.cc
+++ b/chrome/browser/rlz/rlz.cc
@@ -35,6 +35,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 
+using content::BrowserThread;
+
 namespace {
 
 void RecordProductEvents(bool first_run, bool google_default_search,
diff --git a/chrome/browser/safe_browsing/browser_feature_extractor.cc b/chrome/browser/safe_browsing/browser_feature_extractor.cc
index 5dd4186..0723d00 100644
--- a/chrome/browser/safe_browsing/browser_feature_extractor.cc
+++ b/chrome/browser/safe_browsing/browser_feature_extractor.cc
@@ -26,6 +26,8 @@
 #include "content/public/common/page_transition_types.h"
 #include "googleurl/src/gurl.h"
 
+using content::BrowserThread;
+
 namespace safe_browsing {
 
 BrowseInfo::BrowseInfo() : http_status_code(0) {}
diff --git a/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc b/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc
index 28c86a4..7fd44dd 100644
--- a/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc
+++ b/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc
@@ -31,6 +31,7 @@
 
 using ::testing::Return;
 using ::testing::StrictMock;
+using content::BrowserThread;
 
 namespace safe_browsing {
 namespace {
diff --git a/chrome/browser/safe_browsing/client_side_detection_host.cc b/chrome/browser/safe_browsing/client_side_detection_host.cc
index 06c315a7..1cb6ab0 100644
--- a/chrome/browser/safe_browsing/client_side_detection_host.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_host.cc
@@ -35,6 +35,8 @@
 #include "content/public/browser/notification_types.h"
 #include "googleurl/src/gurl.h"
 
+using content::BrowserThread;
+
 namespace safe_browsing {
 
 // This class is instantiated each time a new toplevel URL loads, and
diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
index b611524..82d9429 100644
--- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
@@ -37,6 +37,7 @@ using ::testing::Return;
 using ::testing::SaveArg;
 using ::testing::SetArgumentPointee;
 using ::testing::StrictMock;
+using content::BrowserThread;
 
 namespace {
 const bool kFalse = false;
diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc
index 3c3e54a..b980439 100644
--- a/chrome/browser/safe_browsing/client_side_detection_service.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_service.cc
@@ -35,6 +35,8 @@
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
+using content::BrowserThread;
+
 namespace safe_browsing {
 
 const size_t ClientSideDetectionService::kMaxModelSizeBytes = 90 * 1024;
diff --git a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc
index 4faf19c..e9f3da7 100644
--- a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc
@@ -27,6 +27,7 @@ using ::testing::_;
 using ::testing::Invoke;
 using ::testing::Mock;
 using ::testing::StrictMock;
+using content::BrowserThread;
 
 namespace safe_browsing {
 namespace {
diff --git a/chrome/browser/safe_browsing/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection_service.cc
index f87fb0b..b8d5183 100644
--- a/chrome/browser/safe_browsing/download_protection_service.cc
+++ b/chrome/browser/safe_browsing/download_protection_service.cc
@@ -21,6 +21,8 @@
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
+using content::BrowserThread;
+
 namespace safe_browsing {
 
 const char DownloadProtectionService::kDownloadRequestUrl[] =
diff --git a/chrome/browser/safe_browsing/download_protection_service_unittest.cc b/chrome/browser/safe_browsing/download_protection_service_unittest.cc
index f505441..be3ca1e 100644
--- a/chrome/browser/safe_browsing/download_protection_service_unittest.cc
+++ b/chrome/browser/safe_browsing/download_protection_service_unittest.cc
@@ -26,6 +26,7 @@
 
 using ::testing::Return;
 using ::testing::_;
+using content::BrowserThread;
 
 namespace safe_browsing {
 namespace {
diff --git a/chrome/browser/safe_browsing/malware_details.cc b/chrome/browser/safe_browsing/malware_details.cc
index cc54b7b..2b4a305 100644
--- a/chrome/browser/safe_browsing/malware_details.cc
+++ b/chrome/browser/safe_browsing/malware_details.cc
@@ -23,6 +23,7 @@
 #include "net/disk_cache/disk_cache.h"
 #include "net/url_request/url_request_context_getter.h"
 
+using content::BrowserThread;
 using safe_browsing::ClientMalwareReportRequest;
 
 // Keep in sync with KMaxNodes in renderer/safe_browsing/malware_dom_details
diff --git a/chrome/browser/safe_browsing/malware_details_cache.cc b/chrome/browser/safe_browsing/malware_details_cache.cc
index 93f5831..13dadd7 100644
--- a/chrome/browser/safe_browsing/malware_details_cache.cc
+++ b/chrome/browser/safe_browsing/malware_details_cache.cc
@@ -22,6 +22,7 @@
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
+using content::BrowserThread;
 using safe_browsing::ClientMalwareReportRequest;
 
 // Only send small files for now, a better strategy would use the size
diff --git a/chrome/browser/safe_browsing/malware_details_history.cc b/chrome/browser/safe_browsing/malware_details_history.cc
index c0cf3db..987c0f6 100644
--- a/chrome/browser/safe_browsing/malware_details_history.cc
+++ b/chrome/browser/safe_browsing/malware_details_history.cc
@@ -18,6 +18,8 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 
+using content::BrowserThread;
+
 MalwareDetailsRedirectsCollector::MalwareDetailsRedirectsCollector(
     Profile* profile)
     : profile_(profile),
diff --git a/chrome/browser/safe_browsing/malware_details_history.h b/chrome/browser/safe_browsing/malware_details_history.h
index b0eafb7..f2776c6 100644
--- a/chrome/browser/safe_browsing/malware_details_history.h
+++ b/chrome/browser/safe_browsing/malware_details_history.h
@@ -28,8 +28,9 @@ typedef std::vector<GURL> RedirectChain;
 }
 
 class MalwareDetailsRedirectsCollector
-    : public base::RefCountedThreadSafe<MalwareDetailsRedirectsCollector,
-                                        BrowserThread::DeleteOnUIThread>,
+    : public base::RefCountedThreadSafe<
+          MalwareDetailsRedirectsCollector,
+          content::BrowserThread::DeleteOnUIThread>,
       public content::NotificationObserver {
 
  public:
@@ -49,7 +50,8 @@ class MalwareDetailsRedirectsCollector
   const std::vector<safe_browsing::RedirectChain>& GetCollectedUrls() const;
 
  private:
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
+  friend struct content::BrowserThread::DeleteOnThread<
+      content::BrowserThread::UI>;
   friend class DeleteTask<MalwareDetailsRedirectsCollector>;
 
   Profile* profile_;
diff --git a/chrome/browser/safe_browsing/malware_details_unittest.cc b/chrome/browser/safe_browsing/malware_details_unittest.cc
index dc9580c..d6e253f 100644
--- a/chrome/browser/safe_browsing/malware_details_unittest.cc
+++ b/chrome/browser/safe_browsing/malware_details_unittest.cc
@@ -52,6 +52,7 @@ static const char* kLandingHeaders =
     "Set-Cookie: tastycookie\n";  // This header is stripped.
 static const char* kLandingData = "<iframe src='http://www.malware.com'>";
 
+using content::BrowserThread;
 using safe_browsing::ClientMalwareReportRequest;
 
 namespace {
diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc
index 5de97f3..0c0dd5e 100644
--- a/chrome/browser/safe_browsing/protocol_manager.cc
+++ b/chrome/browser/safe_browsing/protocol_manager.cc
@@ -29,6 +29,7 @@
 
 using base::Time;
 using base::TimeDelta;
+using content::BrowserThread;
 
 // Maximum time, in seconds, from start up before we must issue an update query.
 static const int kSbTimerStartIntervalSec = 5 * 60;
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index f461908..7e13c1d 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -39,6 +39,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+using content::BrowserThread;
+
 // For malware interstitial pages, we link the problematic URL to Google's
 // diagnostic page.
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
index faf09c0..68a273c 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
@@ -26,6 +26,8 @@
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/test/test_browser_thread.h"
 
+using content::BrowserThread;
+
 // A SafeBrowingService class that allows us to inject the malicious URLs.
 class FakeSafeBrowsingService :  public SafeBrowsingService {
  public:
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
index e2115f5..12f10a4 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
@@ -14,6 +14,8 @@
 #include "content/common/view_messages.h"
 #include "content/test/test_browser_thread.h"
 
+using content::BrowserThread;
+
 static const char* kGoogleURL = "http://www.google.com/";
 static const char* kGoodURL = "http://www.goodguys.com/";
 static const char* kBadURL = "http://www.badguys.com/";
diff --git a/chrome/browser/safe_browsing/safe_browsing_database.cc b/chrome/browser/safe_browsing/safe_browsing_database.cc
index fcd6b6b..6721f10 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_database.cc
@@ -25,6 +25,8 @@
 #include "base/mac/mac_util.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 // Filename suffix for the bloom filter.
diff --git a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
index 17451e1..7409f7b 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
@@ -21,6 +21,7 @@
 #include "testing/platform_test.h"
 
 using base::Time;
+using content::BrowserThread;
 
 namespace {
 
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
index c8a4ea4..2222296 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -41,6 +41,8 @@
 #include "chrome/installer/util/browser_distribution.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 // The default URL prefix where browser fetches chunk updates, hashes,
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.h b/chrome/browser/safe_browsing/safe_browsing_service.h
index 65a818f..b4a7850 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.h
+++ b/chrome/browser/safe_browsing/safe_browsing_service.h
@@ -50,8 +50,8 @@ class DownloadProtectionService;
 
 // Construction needs to happen on the main thread.
 class SafeBrowsingService
-    : public base::RefCountedThreadSafe<SafeBrowsingService,
-                                        BrowserThread::DeleteOnUIThread>,
+    : public base::RefCountedThreadSafe<
+          SafeBrowsingService, content::BrowserThread::DeleteOnUIThread>,
       public content::NotificationObserver {
  public:
   class Client;
@@ -329,7 +329,8 @@ class SafeBrowsingService
     base::TimeTicks start;  // When check was queued.
   };
 
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
+  friend struct content::BrowserThread::DeleteOnThread<
+      content::BrowserThread::UI>;
   friend class DeleteTask<SafeBrowsingService>;
   friend class SafeBrowsingServiceTest;
 
diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
index 17bb343..a219312 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
@@ -33,6 +33,7 @@
 
 using base::Histogram;
 using base::StatisticsRecorder;
+using content::BrowserThread;
 
 using ::testing::_;
 using ::testing::Mock;
diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc
index 3252d8c..e3d5cf4 100644
--- a/chrome/browser/safe_browsing/safe_browsing_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_test.cc
@@ -47,6 +47,8 @@
 #include "net/test/python_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace {
 
 const FilePath::CharType kDataFile[] = FILE_PATH_LITERAL("testing_input.dat");
diff --git a/chrome/browser/search_engines/search_provider_install_data.cc b/chrome/browser/search_engines/search_provider_install_data.cc
index d0ddfd8..bc1b77b 100644
--- a/chrome/browser/search_engines/search_provider_install_data.cc
+++ b/chrome/browser/search_engines/search_provider_install_data.cc
@@ -23,6 +23,8 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 
+using content::BrowserThread;
+
 typedef SearchHostToURLsMap::TemplateURLSet TemplateURLSet;
 
 namespace {
diff --git a/chrome/browser/search_engines/search_provider_install_data_unittest.cc b/chrome/browser/search_engines/search_provider_install_data_unittest.cc
index 66bc630..ebd4794 100644
--- a/chrome/browser/search_engines/search_provider_install_data_unittest.cc
+++ b/chrome/browser/search_engines/search_provider_install_data_unittest.cc
@@ -22,6 +22,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 // Create a TemplateURL. The caller owns the returned TemplateURL*.
 static TemplateURL* CreateTemplateURL(const std::string& url,
                                       const std::string& keyword) {
diff --git a/chrome/browser/search_engines/search_provider_install_state_message_filter.cc b/chrome/browser/search_engines/search_provider_install_state_message_filter.cc
index 7c9ad91..bb8b06d 100644
--- a/chrome/browser/search_engines/search_provider_install_state_message_filter.cc
+++ b/chrome/browser/search_engines/search_provider_install_state_message_filter.cc
@@ -13,6 +13,8 @@
 #include "content/public/browser/notification_types.h"
 #include "googleurl/src/gurl.h"
 
+using content::BrowserThread;
+
 SearchProviderInstallStateMessageFilter::
 SearchProviderInstallStateMessageFilter(
     int render_process_id,
diff --git a/chrome/browser/search_engines/search_terms_data.cc b/chrome/browser/search_engines/search_terms_data.cc
index a0ab0ff..c7aa887 100644
--- a/chrome/browser/search_engines/search_terms_data.cc
+++ b/chrome/browser/search_engines/search_terms_data.cc
@@ -17,6 +17,8 @@
 #include "chrome/browser/rlz/rlz.h"
 #endif
 
+using content::BrowserThread;
+
 SearchTermsData::SearchTermsData() {
 }
 
diff --git a/chrome/browser/search_engines/template_url_service_test_util.cc b/chrome/browser/search_engines/template_url_service_test_util.cc
index d980428..7d33f56 100644
--- a/chrome/browser/search_engines/template_url_service_test_util.cc
+++ b/chrome/browser/search_engines/template_url_service_test_util.cc
@@ -17,6 +17,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // A Task used to coordinate when the database has finished processing
diff --git a/chrome/browser/search_engines/template_url_service_unittest.cc b/chrome/browser/search_engines/template_url_service_unittest.cc
index 0d0bb96c..6fcaf03 100644
--- a/chrome/browser/search_engines/template_url_service_unittest.cc
+++ b/chrome/browser/search_engines/template_url_service_unittest.cc
@@ -32,6 +32,7 @@
 
 using base::Time;
 using base::TimeDelta;
+using content::BrowserThread;
 using ::testing::Return;
 using ::testing::StrictMock;
 
diff --git a/chrome/browser/search_engines/util.cc b/chrome/browser/search_engines/util.cc
index 893c23c..bee5bac 100644
--- a/chrome/browser/search_engines/util.cc
+++ b/chrome/browser/search_engines/util.cc
@@ -16,6 +16,8 @@
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 string16 GetDefaultSearchEngineName(Profile* profile) {
   if (!profile) {
     NOTREACHED();
diff --git a/chrome/browser/service/service_process_control.cc b/chrome/browser/service/service_process_control.cc
index b3945dd..99c1668 100644
--- a/chrome/browser/service/service_process_control.cc
+++ b/chrome/browser/service/service_process_control.cc
@@ -23,6 +23,8 @@
 #include "content/public/browser/notification_service.h"
 #include "ui/base/ui_base_switches.h"
 
+using content::BrowserThread;
+
 // ServiceProcessControl implementation.
 ServiceProcessControl::ServiceProcessControl() {
 }
diff --git a/chrome/browser/service/service_process_control_mac.mm b/chrome/browser/service/service_process_control_mac.mm
index 684c82f..5cd05d6 100644
--- a/chrome/browser/service/service_process_control_mac.mm
+++ b/chrome/browser/service/service_process_control_mac.mm
@@ -11,6 +11,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "third_party/GTM/Foundation/GTMServiceManagement.h"
 
+using content::BrowserThread;
+
 void ServiceProcessControl::Launcher::DoRun() {
   base::mac::ScopedCFTypeRef<CFDictionaryRef> launchd_plist(
       CreateServiceProcessLaunchdPlist(cmd_line_.get(), false));
diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc
index 461e49f..fe900e4 100644
--- a/chrome/browser/shell_integration.cc
+++ b/chrome/browser/shell_integration.cc
@@ -16,6 +16,8 @@
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 bool ShellIntegration::CanSetAsDefaultProtocolClient() {
   // Allowed as long as the browser can become the operating system default
   // browser.
diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
index f6787fb..4ec3e02 100644
--- a/chrome/browser/shell_integration_linux.cc
+++ b/chrome/browser/shell_integration_linux.cc
@@ -38,6 +38,8 @@
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/codec/png_codec.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Helper to launch xdg scripts. We don't want them to ask any questions on the
diff --git a/chrome/browser/shell_integration_unittest.cc b/chrome/browser/shell_integration_unittest.cc
index bc4b687..24a9be8 100644
--- a/chrome/browser/shell_integration_unittest.cc
+++ b/chrome/browser/shell_integration_unittest.cc
@@ -28,6 +28,8 @@
 
 #define FPL FILE_PATH_LITERAL
 
+using content::BrowserThread;
+
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 namespace {
 
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
index 152fd72..15baa3e 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc
@@ -36,6 +36,8 @@
 #include "chrome/installer/util/work_item_list.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Helper function for ShellIntegration::GetAppId to generates profile id
diff --git a/chrome/browser/speech/chrome_speech_input_manager.cc b/chrome/browser/speech/chrome_speech_input_manager.cc
index 709bc75..6f305f8 100644
--- a/chrome/browser/speech/chrome_speech_input_manager.cc
+++ b/chrome/browser/speech/chrome_speech_input_manager.cc
@@ -23,6 +23,8 @@
 #include "chrome/installer/util/wmi.h"
 #endif
 
+using content::BrowserThread;
+
 namespace speech_input {
 
 // Asynchronously fetches the PC and audio hardware/driver info if
diff --git a/chrome/browser/speech/chrome_speech_input_preferences.cc b/chrome/browser/speech/chrome_speech_input_preferences.cc
index 9790a2a..c7ff56b 100644
--- a/chrome/browser/speech/chrome_speech_input_preferences.cc
+++ b/chrome/browser/speech/chrome_speech_input_preferences.cc
@@ -9,6 +9,8 @@
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 ChromeSpeechInputPreferences::ChromeSpeechInputPreferences(
     PrefService* pref_service)
     : filter_profanities_(
diff --git a/chrome/browser/speech/speech_input_bubble_controller.cc b/chrome/browser/speech/speech_input_bubble_controller.cc
index 59fa67c..f71f742 100644
--- a/chrome/browser/speech/speech_input_bubble_controller.cc
+++ b/chrome/browser/speech/speech_input_bubble_controller.cc
@@ -13,6 +13,8 @@
 #include "content/public/browser/notification_types.h"
 #include "ui/gfx/rect.h"
 
+using content::BrowserThread;
+
 namespace speech_input {
 
 SpeechInputBubbleController::SpeechInputBubbleController(Delegate* delegate)
diff --git a/chrome/browser/speech/speech_input_bubble_controller_unittest.cc b/chrome/browser/speech/speech_input_bubble_controller_unittest.cc
index 66ef2d7..a4994a4 100644
--- a/chrome/browser/speech/speech_input_bubble_controller_unittest.cc
+++ b/chrome/browser/speech/speech_input_bubble_controller_unittest.cc
@@ -12,6 +12,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/rect.h"
 
+using content::BrowserThread;
+
 class SkBitmap;
 
 namespace speech_input {
diff --git a/chrome/browser/spellchecker/spellcheck_host.cc b/chrome/browser/spellchecker/spellcheck_host.cc
index bfdad0f..cd20c13 100644
--- a/chrome/browser/spellchecker/spellcheck_host.cc
+++ b/chrome/browser/spellchecker/spellcheck_host.cc
@@ -13,6 +13,8 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/spellcheck_common.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // An event used by browser tests to receive status events from this class and
diff --git a/chrome/browser/spellchecker/spellcheck_host.h b/chrome/browser/spellchecker/spellcheck_host.h
index 04272ac..1da6939 100644
--- a/chrome/browser/spellchecker/spellcheck_host.h
+++ b/chrome/browser/spellchecker/spellcheck_host.h
@@ -49,8 +49,8 @@ class URLRequestContextGetter;
 // Users should not hold the reference over the function scope because
 // the instance can be invalidated during the browser's lifecycle.
 class SpellCheckHost
-    : public base::RefCountedThreadSafe<SpellCheckHost,
-                                        BrowserThread::DeleteOnFileThread> {
+    : public base::RefCountedThreadSafe<
+          SpellCheckHost, content::BrowserThread::DeleteOnFileThread> {
  public:
   // Event types used for reporting the status of this class and its derived
   // classes to browser tests.
diff --git a/chrome/browser/spellchecker/spellcheck_host_impl.cc b/chrome/browser/spellchecker/spellcheck_host_impl.cc
index bd18447..8762b1a 100644
--- a/chrome/browser/spellchecker/spellcheck_host_impl.cc
+++ b/chrome/browser/spellchecker/spellcheck_host_impl.cc
@@ -34,6 +34,8 @@
 #include "base/metrics/histogram.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 FilePath GetFirstChoiceFilePath(const std::string& language) {
diff --git a/chrome/browser/spellchecker/spellcheck_host_impl.h b/chrome/browser/spellchecker/spellcheck_host_impl.h
index e53b2c7c..e58cce7 100644
--- a/chrome/browser/spellchecker/spellcheck_host_impl.h
+++ b/chrome/browser/spellchecker/spellcheck_host_impl.h
@@ -60,7 +60,7 @@ class SpellCheckHostImpl : public SpellCheckHost,
   typedef SpellCheckProfileProvider::CustomWordList CustomWordList;
 
   // These two classes can destruct us.
-  friend class BrowserThread;
+  friend class content::BrowserThread;
   friend class DeleteTask<SpellCheckHostImpl>;
 
   virtual ~SpellCheckHostImpl();
diff --git a/chrome/browser/spellchecker/spellcheck_message_filter.cc b/chrome/browser/spellchecker/spellcheck_message_filter.cc
index 647c720..26cec72 100644
--- a/chrome/browser/spellchecker/spellcheck_message_filter.cc
+++ b/chrome/browser/spellchecker/spellcheck_message_filter.cc
@@ -12,6 +12,8 @@
 #include "chrome/common/spellcheck_messages.h"
 #include "content/browser/renderer_host/render_process_host.h"
 
+using content::BrowserThread;
+
 SpellCheckMessageFilter::SpellCheckMessageFilter(int render_process_id)
     : render_process_id_(render_process_id) {
 }
diff --git a/chrome/browser/spellchecker/spellcheck_message_filter.h b/chrome/browser/spellchecker/spellcheck_message_filter.h
index af5989b..cfa9424 100644
--- a/chrome/browser/spellchecker/spellcheck_message_filter.h
+++ b/chrome/browser/spellchecker/spellcheck_message_filter.h
@@ -16,7 +16,7 @@ class SpellCheckMessageFilter : 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);
 
diff --git a/chrome/browser/spellchecker/spellcheck_profile.cc b/chrome/browser/spellchecker/spellcheck_profile.cc
index d5c4de4..dd14804 100644
--- a/chrome/browser/spellchecker/spellcheck_profile.cc
+++ b/chrome/browser/spellchecker/spellcheck_profile.cc
@@ -15,6 +15,8 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
 
+using content::BrowserThread;
+
 namespace {
 base::LazyInstance<SpellCheckProfile::CustomWordList> g_empty_list(
     base::LINKER_INITIALIZED);
diff --git a/chrome/browser/spellchecker/spellcheck_profile_unittest.cc b/chrome/browser/spellchecker/spellcheck_profile_unittest.cc
index 7efabd1..f8b7628 100644
--- a/chrome/browser/spellchecker/spellcheck_profile_unittest.cc
+++ b/chrome/browser/spellchecker/spellcheck_profile_unittest.cc
@@ -11,6 +11,8 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace {
 
 class MockSpellCheckHost : public SpellCheckHost {
diff --git a/chrome/browser/spellchecker/spellchecker_mac.mm b/chrome/browser/spellchecker/spellchecker_mac.mm
index 5b0db7c..2f4f57a 100644
--- a/chrome/browser/spellchecker/spellchecker_mac.mm
+++ b/chrome/browser/spellchecker/spellchecker_mac.mm
@@ -21,6 +21,8 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextCheckingResult.h"
 
 using base::TimeTicks;
+using content::BrowserThread;
+
 namespace {
 // The number of characters in the first part of the language code.
 const unsigned int kShortLanguageCodeSize = 2;
diff --git a/chrome/browser/ssl/ssl_add_cert_handler.cc b/chrome/browser/ssl/ssl_add_cert_handler.cc
index d83aea4..36bcf31 100644
--- a/chrome/browser/ssl/ssl_add_cert_handler.cc
+++ b/chrome/browser/ssl/ssl_add_cert_handler.cc
@@ -16,6 +16,8 @@
 #include "net/base/x509_certificate.h"
 #include "net/url_request/url_request.h"
 
+using content::BrowserThread;
+
 SSLAddCertHandler::SSLAddCertHandler(net::URLRequest* request,
                                      net::X509Certificate* cert,
                                      int render_process_host_id,
diff --git a/chrome/browser/sync/abstract_profile_sync_service_test.cc b/chrome/browser/sync/abstract_profile_sync_service_test.cc
index 187db85..a38dae2 100644
--- a/chrome/browser/sync/abstract_profile_sync_service_test.cc
+++ b/chrome/browser/sync/abstract_profile_sync_service_test.cc
@@ -14,6 +14,7 @@
 #include "chrome/browser/sync/util/cryptographer.h"
 
 using browser_sync::TestIdFactory;
+using content::BrowserThread;
 using sync_api::UserShare;
 using syncable::BASE_VERSION;
 using syncable::CREATE;
diff --git a/chrome/browser/sync/glue/app_notification_data_type_controller.cc b/chrome/browser/sync/glue/app_notification_data_type_controller.cc
index e1a272d..d40b30e 100644
--- a/chrome/browser/sync/glue/app_notification_data_type_controller.cc
+++ b/chrome/browser/sync/glue/app_notification_data_type_controller.cc
@@ -15,6 +15,8 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_source.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 AppNotificationDataTypeController::AppNotificationDataTypeController(
diff --git a/chrome/browser/sync/glue/app_notification_data_type_controller_unittest.cc b/chrome/browser/sync/glue/app_notification_data_type_controller_unittest.cc
index 27d3211..a1a1d11 100644
--- a/chrome/browser/sync/glue/app_notification_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/app_notification_data_type_controller_unittest.cc
@@ -26,6 +26,7 @@ using browser_sync::ChangeProcessorMock;
 using browser_sync::DataTypeController;
 using browser_sync::ModelAssociatorMock;
 using browser_sync::StartCallback;
+using content::BrowserThread;
 using testing::_;
 using testing::DoAll;
 using testing::InvokeWithoutArgs;
diff --git a/chrome/browser/sync/glue/autofill_change_processor.cc b/chrome/browser/sync/glue/autofill_change_processor.cc
index afdc701..54c2796 100644
--- a/chrome/browser/sync/glue/autofill_change_processor.cc
+++ b/chrome/browser/sync/glue/autofill_change_processor.cc
@@ -26,6 +26,8 @@
 #include "chrome/common/guid.h"
 #include "content/public/browser/notification_service.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 struct AutofillChangeProcessor::AutofillChangeRecord {
diff --git a/chrome/browser/sync/glue/autofill_data_type_controller.cc b/chrome/browser/sync/glue/autofill_data_type_controller.cc
index e583986..fcb6422 100644
--- a/chrome/browser/sync/glue/autofill_data_type_controller.cc
+++ b/chrome/browser/sync/glue/autofill_data_type_controller.cc
@@ -17,6 +17,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_source.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 AutofillDataTypeController::AutofillDataTypeController(
diff --git a/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc b/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc
index ed4cc96..941202b 100644
--- a/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc
@@ -31,6 +31,7 @@ using browser_sync::ChangeProcessorMock;
 using browser_sync::DataTypeController;
 using browser_sync::ModelAssociatorMock;
 using browser_sync::StartCallback;
+using content::BrowserThread;
 using testing::_;
 using testing::DoAll;
 using testing::Invoke;
diff --git a/chrome/browser/sync/glue/autofill_model_associator.cc b/chrome/browser/sync/glue/autofill_model_associator.cc
index bc24828..9bf3c9f 100644
--- a/chrome/browser/sync/glue/autofill_model_associator.cc
+++ b/chrome/browser/sync/glue/autofill_model_associator.cc
@@ -30,6 +30,7 @@
 #include "net/base/escape.h"
 
 using base::TimeTicks;
+using content::BrowserThread;
 
 namespace browser_sync {
 
diff --git a/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc b/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc
index 25dd9c9..d6369e7 100644
--- a/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc
+++ b/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc
@@ -19,6 +19,8 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 AutofillProfileDataTypeController::AutofillProfileDataTypeController(
diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc
index 9337105..a5e619a 100644
--- a/chrome/browser/sync/glue/bookmark_change_processor.cc
+++ b/chrome/browser/sync/glue/bookmark_change_processor.cc
@@ -24,6 +24,8 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 BookmarkChangeProcessor::BookmarkChangeProcessor(
diff --git a/chrome/browser/sync/glue/bookmark_data_type_controller.cc b/chrome/browser/sync/glue/bookmark_data_type_controller.cc
index d96fde9..b7e8c604 100644
--- a/chrome/browser/sync/glue/bookmark_data_type_controller.cc
+++ b/chrome/browser/sync/glue/bookmark_data_type_controller.cc
@@ -14,6 +14,8 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 BookmarkDataTypeController::BookmarkDataTypeController(
diff --git a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc
index 8b8b0fa..97f3eb2 100644
--- a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc
@@ -28,6 +28,7 @@ using browser_sync::ChangeProcessorMock;
 using browser_sync::DataTypeController;
 using browser_sync::ModelAssociatorMock;
 using browser_sync::StartCallback;
+using content::BrowserThread;
 using testing::_;
 using testing::DoAll;
 using testing::InvokeWithoutArgs;
diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc
index a30174d..e50506c 100644
--- a/chrome/browser/sync/glue/bookmark_model_associator.cc
+++ b/chrome/browser/sync/glue/bookmark_model_associator.cc
@@ -24,6 +24,8 @@
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 // The sync protocol identifies top-level entities by means of well-known tags,
diff --git a/chrome/browser/sync/glue/browser_thread_model_worker.cc b/chrome/browser/sync/glue/browser_thread_model_worker.cc
index 907ac3a..91baabe 100644
--- a/chrome/browser/sync/glue/browser_thread_model_worker.cc
+++ b/chrome/browser/sync/glue/browser_thread_model_worker.cc
@@ -9,6 +9,7 @@
 #include "content/public/browser/browser_thread.h"
 
 using base::WaitableEvent;
+using content::BrowserThread;
 
 namespace browser_sync {
 
diff --git a/chrome/browser/sync/glue/browser_thread_model_worker.h b/chrome/browser/sync/glue/browser_thread_model_worker.h
index 683dd45..843b9da 100644
--- a/chrome/browser/sync/glue/browser_thread_model_worker.h
+++ b/chrome/browser/sync/glue/browser_thread_model_worker.h
@@ -24,7 +24,8 @@ namespace browser_sync {
 // TODO(sync): Try to generalize other ModelWorkers (e.g. history, etc).
 class BrowserThreadModelWorker : public browser_sync::ModelSafeWorker {
  public:
-  BrowserThreadModelWorker(BrowserThread::ID thread, ModelSafeGroup group);
+  BrowserThreadModelWorker(content::BrowserThread::ID thread,
+                           ModelSafeGroup group);
   virtual ~BrowserThreadModelWorker();
 
   // ModelSafeWorker implementation. Called on the sync thread.
@@ -42,7 +43,7 @@ class BrowserThreadModelWorker : public browser_sync::ModelSafeWorker {
       UnrecoverableErrorInfo* error_info) = 0;
 
  private:
-  BrowserThread::ID thread_;
+  content::BrowserThread::ID thread_;
   ModelSafeGroup group_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserThreadModelWorker);
diff --git a/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc b/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc
index c0b6472..21edae1 100644
--- a/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc
+++ b/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc
@@ -17,6 +17,7 @@
 using base::OneShotTimer;
 using base::Thread;
 using base::TimeDelta;
+using content::BrowserThread;
 
 namespace browser_sync {
 
diff --git a/chrome/browser/sync/glue/data_type_controller.h b/chrome/browser/sync/glue/data_type_controller.h
index 448ab80..5eca748 100644
--- a/chrome/browser/sync/glue/data_type_controller.h
+++ b/chrome/browser/sync/glue/data_type_controller.h
@@ -23,8 +23,8 @@ namespace browser_sync {
 // Data type controllers need to be refcounted threadsafe, as they may
 // need to run model associator or change processor on other threads.
 class DataTypeController
-    : public base::RefCountedThreadSafe<DataTypeController,
-                                        BrowserThread::DeleteOnUIThread>,
+    : public base::RefCountedThreadSafe<
+          DataTypeController, content::BrowserThread::DeleteOnUIThread>,
       public UnrecoverableErrorHandler {
  public:
   enum State {
@@ -92,7 +92,8 @@ class DataTypeController
   virtual State state() const = 0;
 
  protected:
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
+  friend struct content::BrowserThread::DeleteOnThread<
+      content::BrowserThread::UI>;
   friend class DeleteTask<DataTypeController>;
   friend class ShutdownTask;
 
diff --git a/chrome/browser/sync/glue/data_type_manager_impl.cc b/chrome/browser/sync/glue/data_type_manager_impl.cc
index be3ebf7..2d49be4 100644
--- a/chrome/browser/sync/glue/data_type_manager_impl.cc
+++ b/chrome/browser/sync/glue/data_type_manager_impl.cc
@@ -22,6 +22,8 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 namespace {
diff --git a/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc b/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc
index 91cb078..5367ea6 100644
--- a/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc
+++ b/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc
@@ -30,6 +30,7 @@ using browser_sync::DataTypeManagerImpl;
 using browser_sync::DataTypeController;
 using browser_sync::DataTypeControllerMock;
 using browser_sync::SyncBackendHostMock;
+using content::BrowserThread;
 using testing::_;
 using testing::AtLeast;
 using testing::DoAll;
diff --git a/chrome/browser/sync/glue/extension_data_type_controller_unittest.cc b/chrome/browser/sync/glue/extension_data_type_controller_unittest.cc
index babad4e..9563b4e 100644
--- a/chrome/browser/sync/glue/extension_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/extension_data_type_controller_unittest.cc
@@ -22,6 +22,7 @@ using browser_sync::ChangeProcessorMock;
 using browser_sync::DataTypeController;
 using browser_sync::ModelAssociatorMock;
 using browser_sync::StartCallback;
+using content::BrowserThread;
 using testing::_;
 using testing::DoAll;
 using testing::InvokeWithoutArgs;
diff --git a/chrome/browser/sync/glue/extension_setting_data_type_controller.cc b/chrome/browser/sync/glue/extension_setting_data_type_controller.cc
index 8fbe849..be90968 100644
--- a/chrome/browser/sync/glue/extension_setting_data_type_controller.cc
+++ b/chrome/browser/sync/glue/extension_setting_data_type_controller.cc
@@ -13,6 +13,8 @@
 #include "chrome/browser/sync/profile_sync_factory.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 ExtensionSettingDataTypeController::ExtensionSettingDataTypeController(
diff --git a/chrome/browser/sync/glue/frontend_data_type_controller.cc b/chrome/browser/sync/glue/frontend_data_type_controller.cc
index fde93c1..731f0a0 100644
--- a/chrome/browser/sync/glue/frontend_data_type_controller.cc
+++ b/chrome/browser/sync/glue/frontend_data_type_controller.cc
@@ -14,6 +14,8 @@
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 FrontendDataTypeController::FrontendDataTypeController()
diff --git a/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc b/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc
index 9f2a711..13adce0 100644
--- a/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc
@@ -25,6 +25,7 @@ using browser_sync::FrontendDataTypeController;
 using browser_sync::FrontendDataTypeControllerMock;
 using browser_sync::ModelAssociatorMock;
 using browser_sync::StartCallback;
+using content::BrowserThread;
 using testing::_;
 using testing::DoAll;
 using testing::InvokeWithoutArgs;
diff --git a/chrome/browser/sync/glue/generic_change_processor.cc b/chrome/browser/sync/glue/generic_change_processor.cc
index 9290df6..03cd869 100644
--- a/chrome/browser/sync/glue/generic_change_processor.cc
+++ b/chrome/browser/sync/glue/generic_change_processor.cc
@@ -18,6 +18,8 @@
 #include "chrome/browser/sync/unrecoverable_error_handler.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 GenericChangeProcessor::GenericChangeProcessor(
diff --git a/chrome/browser/sync/glue/http_bridge.cc b/chrome/browser/sync/glue/http_bridge.cc
index a0f0c70..7e39b47 100644
--- a/chrome/browser/sync/glue/http_bridge.cc
+++ b/chrome/browser/sync/glue/http_bridge.cc
@@ -21,6 +21,8 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_status.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 HttpBridge::RequestContextGetter::RequestContextGetter(
diff --git a/chrome/browser/sync/glue/http_bridge_unittest.cc b/chrome/browser/sync/glue/http_bridge_unittest.cc
index 9db450e..deb60de 100644
--- a/chrome/browser/sync/glue/http_bridge_unittest.cc
+++ b/chrome/browser/sync/glue/http_bridge_unittest.cc
@@ -13,6 +13,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using browser_sync::HttpBridge;
+using content::BrowserThread;
 
 namespace {
 // TODO(timsteele): Should use PathService here. See Chromium Issue 3113.
diff --git a/chrome/browser/sync/glue/new_non_frontend_data_type_controller.cc b/chrome/browser/sync/glue/new_non_frontend_data_type_controller.cc
index b642e65..f1ef7aa 100644
--- a/chrome/browser/sync/glue/new_non_frontend_data_type_controller.cc
+++ b/chrome/browser/sync/glue/new_non_frontend_data_type_controller.cc
@@ -13,6 +13,8 @@
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 NewNonFrontendDataTypeController::NewNonFrontendDataTypeController()
diff --git a/chrome/browser/sync/glue/new_non_frontend_data_type_controller_unittest.cc b/chrome/browser/sync/glue/new_non_frontend_data_type_controller_unittest.cc
index 61c8cd26..6e8366a 100644
--- a/chrome/browser/sync/glue/new_non_frontend_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/new_non_frontend_data_type_controller_unittest.cc
@@ -30,6 +30,7 @@ using browser_sync::GROUP_DB;
 using browser_sync::NewNonFrontendDataTypeController;
 using browser_sync::NewNonFrontendDataTypeControllerMock;
 using browser_sync::StartCallback;
+using content::BrowserThread;
 using syncable::AUTOFILL_PROFILE;
 using testing::_;
 using testing::DoAll;
diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller.cc b/chrome/browser/sync/glue/non_frontend_data_type_controller.cc
index 3fbf304..796e0fe 100644
--- a/chrome/browser/sync/glue/non_frontend_data_type_controller.cc
+++ b/chrome/browser/sync/glue/non_frontend_data_type_controller.cc
@@ -16,6 +16,8 @@
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 NonFrontendDataTypeController::NonFrontendDataTypeController()
diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc b/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc
index b283c3d..2f10732 100644
--- a/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc
@@ -30,6 +30,7 @@ using browser_sync::NonFrontendDataTypeController;
 using browser_sync::NonFrontendDataTypeControllerMock;
 using browser_sync::ModelAssociatorMock;
 using browser_sync::StartCallback;
+using content::BrowserThread;
 using testing::_;
 using testing::DoAll;
 using testing::InvokeWithoutArgs;
diff --git a/chrome/browser/sync/glue/password_change_processor.cc b/chrome/browser/sync/glue/password_change_processor.cc
index 9aae52d..180a796 100644
--- a/chrome/browser/sync/glue/password_change_processor.cc
+++ b/chrome/browser/sync/glue/password_change_processor.cc
@@ -25,6 +25,8 @@
 #include "content/public/browser/notification_source.h"
 #include "webkit/glue/password_form.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 PasswordChangeProcessor::PasswordChangeProcessor(
diff --git a/chrome/browser/sync/glue/password_data_type_controller.cc b/chrome/browser/sync/glue/password_data_type_controller.cc
index 22a218a..06bbf70 100644
--- a/chrome/browser/sync/glue/password_data_type_controller.cc
+++ b/chrome/browser/sync/glue/password_data_type_controller.cc
@@ -14,6 +14,8 @@
 #include "chrome/browser/webdata/web_data_service.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 PasswordDataTypeController::PasswordDataTypeController(
diff --git a/chrome/browser/sync/glue/password_model_associator.cc b/chrome/browser/sync/glue/password_model_associator.cc
index 519b729..a33f78d 100644
--- a/chrome/browser/sync/glue/password_model_associator.cc
+++ b/chrome/browser/sync/glue/password_model_associator.cc
@@ -20,6 +20,8 @@
 #include "net/base/escape.h"
 #include "webkit/glue/password_form.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 const char kPasswordTag[] = "google_chrome_passwords";
diff --git a/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc b/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc
index 4404f2e..f3c9549 100644
--- a/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc
@@ -23,6 +23,7 @@ using browser_sync::DataTypeController;
 using browser_sync::ModelAssociatorMock;
 using browser_sync::PreferenceDataTypeController;
 using browser_sync::StartCallback;
+using content::BrowserThread;
 using testing::_;
 using testing::DoAll;
 using testing::InvokeWithoutArgs;
diff --git a/chrome/browser/sync/glue/search_engine_data_type_controller.cc b/chrome/browser/sync/glue/search_engine_data_type_controller.cc
index 25c9f5b..41ae480 100644
--- a/chrome/browser/sync/glue/search_engine_data_type_controller.cc
+++ b/chrome/browser/sync/glue/search_engine_data_type_controller.cc
@@ -14,6 +14,8 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_source.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 SearchEngineDataTypeController::SearchEngineDataTypeController(
diff --git a/chrome/browser/sync/glue/session_change_processor.cc b/chrome/browser/sync/glue/session_change_processor.cc
index f649e57..a296264 100644
--- a/chrome/browser/sync/glue/session_change_processor.cc
+++ b/chrome/browser/sync/glue/session_change_processor.cc
@@ -25,6 +25,8 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 namespace {
diff --git a/chrome/browser/sync/glue/session_model_associator.cc b/chrome/browser/sync/glue/session_model_associator.cc
index a655891..179db92 100644
--- a/chrome/browser/sync/glue/session_model_associator.cc
+++ b/chrome/browser/sync/glue/session_model_associator.cc
@@ -38,6 +38,7 @@
 
 namespace browser_sync {
 
+using content::BrowserThread;
 using syncable::SESSIONS;
 
 namespace {
diff --git a/chrome/browser/sync/glue/shared_change_processor.cc b/chrome/browser/sync/glue/shared_change_processor.cc
index b1122c1..54c1024 100644
--- a/chrome/browser/sync/glue/shared_change_processor.cc
+++ b/chrome/browser/sync/glue/shared_change_processor.cc
@@ -11,6 +11,7 @@
 #include "content/public/browser/browser_thread.h"
 
 using base::AutoLock;
+using content::BrowserThread;
 
 namespace browser_sync {
 
diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc
index 67f364f..4834411 100644
--- a/chrome/browser/sync/glue/sync_backend_host.cc
+++ b/chrome/browser/sync/glue/sync_backend_host.cc
@@ -46,6 +46,7 @@ typedef GoogleServiceAuthError AuthError;
 
 namespace browser_sync {
 
+using content::BrowserThread;
 using sessions::SyncSessionSnapshot;
 using sync_api::SyncCredentials;
 
diff --git a/chrome/browser/sync/glue/sync_backend_host_unittest.cc b/chrome/browser/sync/glue/sync_backend_host_unittest.cc
index fe9852f..b8812ff 100644
--- a/chrome/browser/sync/glue/sync_backend_host_unittest.cc
+++ b/chrome/browser/sync/glue/sync_backend_host_unittest.cc
@@ -21,6 +21,8 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 namespace {
diff --git a/chrome/browser/sync/glue/sync_backend_registrar.cc b/chrome/browser/sync/glue/sync_backend_registrar.cc
index 24f4c0d..e569a65 100644
--- a/chrome/browser/sync/glue/sync_backend_registrar.cc
+++ b/chrome/browser/sync/glue/sync_backend_registrar.cc
@@ -18,6 +18,8 @@
 #include "chrome/browser/sync/glue/ui_model_worker.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 namespace {
diff --git a/chrome/browser/sync/glue/sync_backend_registrar_unittest.cc b/chrome/browser/sync/glue/sync_backend_registrar_unittest.cc
index a51ecad..7ba8d22 100644
--- a/chrome/browser/sync/glue/sync_backend_registrar_unittest.cc
+++ b/chrome/browser/sync/glue/sync_backend_registrar_unittest.cc
@@ -21,6 +21,7 @@ using ::testing::_;
 using ::testing::InSequence;
 using ::testing::Return;
 using ::testing::StrictMock;
+using content::BrowserThread;
 using syncable::FIRST_REAL_MODEL_TYPE;
 using syncable::AUTOFILL;
 using syncable::BOOKMARKS;
diff --git a/chrome/browser/sync/glue/theme_data_type_controller_unittest.cc b/chrome/browser/sync/glue/theme_data_type_controller_unittest.cc
index 928d3fc..af741e3 100644
--- a/chrome/browser/sync/glue/theme_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/theme_data_type_controller_unittest.cc
@@ -22,6 +22,7 @@ using browser_sync::ChangeProcessorMock;
 using browser_sync::DataTypeController;
 using browser_sync::ModelAssociatorMock;
 using browser_sync::StartCallback;
+using content::BrowserThread;
 using testing::_;
 using testing::DoAll;
 using testing::InvokeWithoutArgs;
diff --git a/chrome/browser/sync/glue/typed_url_change_processor.cc b/chrome/browser/sync/glue/typed_url_change_processor.cc
index adbc836..945dccb 100644
--- a/chrome/browser/sync/glue/typed_url_change_processor.cc
+++ b/chrome/browser/sync/glue/typed_url_change_processor.cc
@@ -20,6 +20,8 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "content/browser/notification_service_impl.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 // This is the threshold at which we start throttling sync updates for typed
diff --git a/chrome/browser/sync/glue/typed_url_data_type_controller.cc b/chrome/browser/sync/glue/typed_url_data_type_controller.cc
index 845c930..ea07e96 100644
--- a/chrome/browser/sync/glue/typed_url_data_type_controller.cc
+++ b/chrome/browser/sync/glue/typed_url_data_type_controller.cc
@@ -16,6 +16,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 class ControlTask : public HistoryDBTask {
diff --git a/chrome/browser/sync/glue/typed_url_model_associator.cc b/chrome/browser/sync/glue/typed_url_model_associator.cc
index 8617782..69c5565 100644
--- a/chrome/browser/sync/glue/typed_url_model_associator.cc
+++ b/chrome/browser/sync/glue/typed_url_model_associator.cc
@@ -19,6 +19,8 @@
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/protocol/typed_url_specifics.pb.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 // The server backend can't handle arbitrarily large node sizes, so to keep
diff --git a/chrome/browser/sync/glue/typed_url_model_associator_unittest.cc b/chrome/browser/sync/glue/typed_url_model_associator_unittest.cc
index a54cd13..0da253d 100644
--- a/chrome/browser/sync/glue/typed_url_model_associator_unittest.cc
+++ b/chrome/browser/sync/glue/typed_url_model_associator_unittest.cc
@@ -18,6 +18,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using browser_sync::TypedUrlModelAssociator;
+using content::BrowserThread;
 
 class TypedUrlModelAssociatorTest : public testing::Test {
  public:
diff --git a/chrome/browser/sync/glue/ui_model_worker.cc b/chrome/browser/sync/glue/ui_model_worker.cc
index 55fa22a..70ee0eb 100644
--- a/chrome/browser/sync/glue/ui_model_worker.cc
+++ b/chrome/browser/sync/glue/ui_model_worker.cc
@@ -9,6 +9,8 @@
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 UnrecoverableErrorInfo UIModelWorker::DoWorkAndWaitUntilDone(
diff --git a/chrome/browser/sync/glue/ui_model_worker_unittest.cc b/chrome/browser/sync/glue/ui_model_worker_unittest.cc
index b71796b..dc23f56 100644
--- a/chrome/browser/sync/glue/ui_model_worker_unittest.cc
+++ b/chrome/browser/sync/glue/ui_model_worker_unittest.cc
@@ -16,6 +16,7 @@
 
 using browser_sync::UIModelWorker;
 using browser_sync::UnrecoverableErrorInfo;
+using content::BrowserThread;
 
 // Various boilerplate, primarily for the StopWithPendingWork test.
 
diff --git a/chrome/browser/sync/internal_api/syncapi_unittest.cc b/chrome/browser/sync/internal_api/syncapi_unittest.cc
index c9e59c9..c9a29e4 100644
--- a/chrome/browser/sync/internal_api/syncapi_unittest.cc
+++ b/chrome/browser/sync/internal_api/syncapi_unittest.cc
@@ -71,6 +71,7 @@ using browser_sync::ModelSafeWorker;
 using browser_sync::ModelSafeWorkerRegistrar;
 using browser_sync::sessions::SyncSessionSnapshot;
 using browser_sync::WeakHandle;
+using content::BrowserThread;
 using syncable::GetAllRealModelTypes;
 using syncable::kEncryptedString;
 using syncable::ModelType;
diff --git a/chrome/browser/sync/notifier/invalidation_notifier_unittest.cc b/chrome/browser/sync/notifier/invalidation_notifier_unittest.cc
index 6aa1c96..4ec2d65 100644
--- a/chrome/browser/sync/notifier/invalidation_notifier_unittest.cc
+++ b/chrome/browser/sync/notifier/invalidation_notifier_unittest.cc
@@ -26,6 +26,7 @@ namespace {
 
 using ::testing::InSequence;
 using ::testing::StrictMock;
+using content::BrowserThread;
 
 class InvalidationNotifierTest : public testing::Test {
  public:
diff --git a/chrome/browser/sync/notifier/non_blocking_invalidation_notifier_unittest.cc b/chrome/browser/sync/notifier/non_blocking_invalidation_notifier_unittest.cc
index be5da31..90e21a4 100644
--- a/chrome/browser/sync/notifier/non_blocking_invalidation_notifier_unittest.cc
+++ b/chrome/browser/sync/notifier/non_blocking_invalidation_notifier_unittest.cc
@@ -24,6 +24,7 @@ namespace {
 
 using ::testing::InSequence;
 using ::testing::StrictMock;
+using content::BrowserThread;
 
 class NonBlockingInvalidationNotifierTest : public testing::Test {
  public:
diff --git a/chrome/browser/sync/notifier/sync_notifier_factory.cc b/chrome/browser/sync/notifier/sync_notifier_factory.cc
index aa636a9..3aea5f4 100644
--- a/chrome/browser/sync/notifier/sync_notifier_factory.cc
+++ b/chrome/browser/sync/notifier/sync_notifier_factory.cc
@@ -21,6 +21,8 @@
 #include "jingle/notifier/listener/talk_mediator_impl.h"
 #include "net/base/host_port_pair.h"
 
+using content::BrowserThread;
+
 namespace sync_notifier {
 namespace {
 
diff --git a/chrome/browser/sync/profile_sync_factory_impl.cc b/chrome/browser/sync/profile_sync_factory_impl.cc
index 169eb0e..f6948ca 100644
--- a/chrome/browser/sync/profile_sync_factory_impl.cc
+++ b/chrome/browser/sync/profile_sync_factory_impl.cc
@@ -83,6 +83,7 @@ using browser_sync::TypedUrlChangeProcessor;
 using browser_sync::TypedUrlDataTypeController;
 using browser_sync::TypedUrlModelAssociator;
 using browser_sync::UnrecoverableErrorHandler;
+using content::BrowserThread;
 
 ProfileSyncFactoryImpl::ProfileSyncFactoryImpl(Profile* profile,
                                                CommandLine* command_line)
diff --git a/chrome/browser/sync/profile_sync_factory_impl_unittest.cc b/chrome/browser/sync/profile_sync_factory_impl_unittest.cc
index 8331854..74cd79a 100644
--- a/chrome/browser/sync/profile_sync_factory_impl_unittest.cc
+++ b/chrome/browser/sync/profile_sync_factory_impl_unittest.cc
@@ -17,6 +17,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using browser_sync::DataTypeController;
+using content::BrowserThread;
 
 class ProfileSyncFactoryImplTest : public testing::Test {
  protected:
diff --git a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
index d2551bc..dae7680 100644
--- a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
@@ -70,6 +70,7 @@ using browser_sync::GROUP_DB;
 using browser_sync::kAutofillTag;
 using browser_sync::SyncBackendHostForProfileSyncTest;
 using browser_sync::UnrecoverableErrorHandler;
+using content::BrowserThread;
 using syncable::CREATE_NEW_UPDATE_ITEM;
 using syncable::AUTOFILL;
 using syncable::BASE_VERSION;
diff --git a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
index 0c3fb4d..f24106e 100644
--- a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
@@ -44,6 +44,7 @@ using testing::_;
 using testing::InvokeWithoutArgs;
 using testing::Mock;
 using testing::StrictMock;
+using content::BrowserThread;
 
 class TestBookmarkModelAssociator : public BookmarkModelAssociator {
  public:
diff --git a/chrome/browser/sync/profile_sync_service_password_unittest.cc b/chrome/browser/sync/profile_sync_service_password_unittest.cc
index 5ada9bb..cd59234 100644
--- a/chrome/browser/sync/profile_sync_service_password_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_password_unittest.cc
@@ -47,6 +47,7 @@ using browser_sync::PasswordDataTypeController;
 using browser_sync::PasswordModelAssociator;
 using browser_sync::TestIdFactory;
 using browser_sync::UnrecoverableErrorHandler;
+using content::BrowserThread;
 using sync_api::SyncManager;
 using sync_api::UserShare;
 using syncable::BASE_VERSION;
diff --git a/chrome/browser/sync/profile_sync_service_session_unittest.cc b/chrome/browser/sync/profile_sync_service_session_unittest.cc
index 8cab39a..ed25ad0 100644
--- a/chrome/browser/sync/profile_sync_service_session_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_session_unittest.cc
@@ -51,6 +51,7 @@ using browser_sync::SessionChangeProcessor;
 using browser_sync::SessionDataTypeController;
 using browser_sync::SessionModelAssociator;
 using browser_sync::SyncBackendHost;
+using content::BrowserThread;
 using sync_api::ChangeRecord;
 using testing::_;
 using testing::Return;
diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
index 6c94eb4..674c423 100644
--- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
@@ -24,6 +24,7 @@
 
 using browser_sync::DataTypeManager;
 using browser_sync::DataTypeManagerMock;
+using content::BrowserThread;
 using testing::_;
 using testing::AnyNumber;
 using testing::DoAll;
diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc
index e90a0e8..376687f 100644
--- a/chrome/browser/sync/profile_sync_service_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_unittest.cc
@@ -33,6 +33,7 @@ namespace browser_sync {
 
 namespace {
 
+using content::BrowserThread;
 using testing::_;
 using testing::AtLeast;
 using testing::AtMost;
diff --git a/chrome/browser/sync/profile_sync_test_util.cc b/chrome/browser/sync/profile_sync_test_util.cc
index bdbb810..7a18bb0 100644
--- a/chrome/browser/sync/profile_sync_test_util.cc
+++ b/chrome/browser/sync/profile_sync_test_util.cc
@@ -8,6 +8,8 @@
 #include "base/task.h"
 #include "base/threading/thread.h"
 
+using content::BrowserThread;
+
 ProfileSyncServiceObserverMock::ProfileSyncServiceObserverMock() {}
 
 ProfileSyncServiceObserverMock::~ProfileSyncServiceObserverMock() {}
diff --git a/chrome/browser/sync/profile_sync_test_util.h b/chrome/browser/sync/profile_sync_test_util.h
index 024ae05..e2572635 100644
--- a/chrome/browser/sync/profile_sync_test_util.h
+++ b/chrome/browser/sync/profile_sync_test_util.h
@@ -31,7 +31,7 @@ ACTION_P(Notify, type) {
 }
 
 ACTION(QuitUIMessageLoop) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   MessageLoop::current()->Quit();
 }
 
diff --git a/chrome/browser/sync/sessions/sync_session_context.cc b/chrome/browser/sync/sessions/sync_session_context.cc
index 8448d00..b92015a 100644
--- a/chrome/browser/sync/sessions/sync_session_context.cc
+++ b/chrome/browser/sync/sessions/sync_session_context.cc
@@ -9,6 +9,8 @@
 #include "chrome/browser/sync/util/extensions_activity_monitor.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 namespace sessions {
 
diff --git a/chrome/browser/sync/sync_global_error_unittest.cc b/chrome/browser/sync/sync_global_error_unittest.cc
index 954ec2f..0215151 100644
--- a/chrome/browser/sync/sync_global_error_unittest.cc
+++ b/chrome/browser/sync/sync_global_error_unittest.cc
@@ -14,6 +14,7 @@
 
 using ::testing::Return;
 using ::testing::NiceMock;
+using content::BrowserThread;
 
 namespace {
 
diff --git a/chrome/browser/sync/sync_ui_util_unittest.cc b/chrome/browser/sync/sync_ui_util_unittest.cc
index d527f0f..b392ed6 100644
--- a/chrome/browser/sync/sync_ui_util_unittest.cc
+++ b/chrome/browser/sync/sync_ui_util_unittest.cc
@@ -13,6 +13,7 @@
 
 using ::testing::Return;
 using ::testing::NiceMock;
+using content::BrowserThread;
 
 namespace {
 
diff --git a/chrome/browser/sync/test/integration/autofill_helper.cc b/chrome/browser/sync/test/integration/autofill_helper.cc
index 72a2d55..b2deecc 100644
--- a/chrome/browser/sync/test/integration/autofill_helper.cc
+++ b/chrome/browser/sync/test/integration/autofill_helper.cc
@@ -23,6 +23,7 @@
 #include "webkit/glue/form_field.h"
 
 using base::WaitableEvent;
+using content::BrowserThread;
 using sync_datatype_helper::test;
 using testing::_;
 
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index c2c6247..6d39389 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -49,6 +49,8 @@
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
+using content::BrowserThread;
+
 namespace switches {
 const char kPasswordFileForTest[] = "password-file-for-test";
 const char kSyncUserForTest[] = "sync-user-for-test";
diff --git a/chrome/browser/sync/tools/sync_listen_notifications.cc b/chrome/browser/sync/tools/sync_listen_notifications.cc
index 3823a27..91d1fed 100644
--- a/chrome/browser/sync/tools/sync_listen_notifications.cc
+++ b/chrome/browser/sync/tools/sync_listen_notifications.cc
@@ -23,6 +23,8 @@
 #include "chrome/test/base/test_url_request_context_getter.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 // This is a simple utility that initializes a sync notifier and
 // listens to any received notifications.
 
@@ -93,9 +95,9 @@ int main(int argc, char* argv[]) {
       logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
 
   MessageLoop ui_loop;
-  DeprecatedBrowserThread ui_thread(BrowserThread::UI, &ui_loop);
+  content::DeprecatedBrowserThread ui_thread(BrowserThread::UI, &ui_loop);
 
-  DeprecatedBrowserThread io_thread(BrowserThread::IO);
+  content::DeprecatedBrowserThread io_thread(BrowserThread::IO);
   base::Thread::Options options;
   options.message_loop_type = MessageLoop::TYPE_IO;
   io_thread.StartWithOptions(options);
diff --git a/chrome/browser/sync/util/extensions_activity_monitor.cc b/chrome/browser/sync/util/extensions_activity_monitor.cc
index d59ceaa..c06e325 100644
--- a/chrome/browser/sync/util/extensions_activity_monitor.cc
+++ b/chrome/browser/sync/util/extensions_activity_monitor.cc
@@ -11,6 +11,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 
+using content::BrowserThread;
+
 namespace browser_sync {
 
 namespace {
diff --git a/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc b/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc
index 9644ab8..b719f37 100644
--- a/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc
+++ b/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc
@@ -17,6 +17,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using browser_sync::ExtensionsActivityMonitor;
+using content::BrowserThread;
 namespace keys = extension_manifest_keys;
 
 namespace {
diff --git a/chrome/browser/tab_contents/spellchecker_submenu_observer.cc b/chrome/browser/tab_contents/spellchecker_submenu_observer.cc
index 1cecb57..b8f31ae 100644
--- a/chrome/browser/tab_contents/spellchecker_submenu_observer.cc
+++ b/chrome/browser/tab_contents/spellchecker_submenu_observer.cc
@@ -21,6 +21,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 
+using content::BrowserThread;
+
 SpellCheckerSubMenuObserver::SpellCheckerSubMenuObserver(
     RenderViewContextMenuProxy* proxy,
     ui::SimpleMenuModel::Delegate* delegate,
diff --git a/chrome/browser/tab_contents/spelling_menu_observer.cc b/chrome/browser/tab_contents/spelling_menu_observer.cc
index 3555806..0a95de4 100644
--- a/chrome/browser/tab_contents/spelling_menu_observer.cc
+++ b/chrome/browser/tab_contents/spelling_menu_observer.cc
@@ -36,6 +36,8 @@
 #define SPELLING_SERVICE_URL "http://127.0.0.1/rpc"
 #endif
 
+using content::BrowserThread;
+
 SpellingMenuObserver::SpellingMenuObserver(RenderViewContextMenuProxy* proxy)
     : proxy_(proxy),
       loading_frame_(0),
diff --git a/chrome/browser/tab_contents/web_contents_unittest.cc b/chrome/browser/tab_contents/web_contents_unittest.cc
index accc5f9..df1cc98 100644
--- a/chrome/browser/tab_contents/web_contents_unittest.cc
+++ b/chrome/browser/tab_contents/web_contents_unittest.cc
@@ -31,6 +31,7 @@
 #include "ui/base/message_box_flags.h"
 #include "webkit/glue/webkit_glue.h"
 
+using content::BrowserThread;
 using webkit_glue::PasswordForm;
 
 class TestInterstitialPage : public ChromeInterstitialPage {
diff --git a/chrome/browser/tab_contents/web_drag_source_win.cc b/chrome/browser/tab_contents/web_drag_source_win.cc
index 7a08a3b..5453896 100644
--- a/chrome/browser/tab_contents/web_drag_source_win.cc
+++ b/chrome/browser/tab_contents/web_drag_source_win.cc
@@ -12,6 +12,7 @@
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 
+using content::BrowserThread;
 using WebKit::WebDragOperationNone;
 
 namespace {
diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc
index f8d6a45..635097c 100644
--- a/chrome/browser/tabs/tab_strip_model_unittest.cc
+++ b/chrome/browser/tabs/tab_strip_model_unittest.cc
@@ -40,6 +40,7 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using testing::_;
 
 namespace {
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
index a586892..98c965c 100644
--- a/chrome/browser/task_manager/task_manager.cc
+++ b/chrome/browser/task_manager/task_manager.cc
@@ -45,6 +45,8 @@
 #include "content/browser/mach_broker_mac.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 // The delay between updates of the information (in ms).
diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc
index c21195b..47edeb7 100644
--- a/chrome/browser/task_manager/task_manager_resource_providers.cc
+++ b/chrome/browser/task_manager/task_manager_resource_providers.cc
@@ -62,6 +62,8 @@
 #include "ui/gfx/icon_util.h"
 #endif  // defined(OS_WIN)
 
+using content::BrowserThread;
+
 namespace {
 
 // Returns the appropriate message prefix ID for tabs and extensions,
diff --git a/chrome/browser/task_manager/task_manager_worker_resource_provider.cc b/chrome/browser/task_manager/task_manager_worker_resource_provider.cc
index bf29177..d37e1be 100644
--- a/chrome/browser/task_manager/task_manager_worker_resource_provider.cc
+++ b/chrome/browser/task_manager/task_manager_worker_resource_provider.cc
@@ -22,6 +22,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+using content::BrowserThread;
+
 // Objects of this class are created on the IO thread and then passed to the UI
 // thread where they are passed to the task manager. All methods must be called
 // only on the UI thread. Destructor may be called on any thread.
diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc
index 785d73c..ff1121a 100644
--- a/chrome/browser/themes/browser_theme_pack.cc
+++ b/chrome/browser/themes/browser_theme_pack.cc
@@ -25,6 +25,8 @@
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/skbitmap_operations.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Version number of the current theme pack. We just throw out and rebuild
diff --git a/chrome/browser/themes/browser_theme_pack.h b/chrome/browser/themes/browser_theme_pack.h
index e46dc1d..d79fdc4 100644
--- a/chrome/browser/themes/browser_theme_pack.h
+++ b/chrome/browser/themes/browser_theme_pack.h
@@ -46,7 +46,7 @@ class DictionaryValue;
 // common case, they are backed by mmapped data and the unmmapping operation
 // will trip our IO on the UI thread detector.
 class BrowserThemePack : public base::RefCountedThreadSafe<
-    BrowserThemePack, BrowserThread::DeleteOnFileThread> {
+    BrowserThemePack, content::BrowserThread::DeleteOnFileThread> {
  public:
   // Builds the theme pack from all data from |extension|. This is often done
   // on a separate thread as it takes so long. This can fail and return NULL in
@@ -91,7 +91,8 @@ class BrowserThemePack : public base::RefCountedThreadSafe<
   bool HasCustomImage(int id) const;
 
  private:
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::FILE>;
+  friend struct content::BrowserThread::DeleteOnThread<
+      content::BrowserThread::FILE>;
   friend class DeleteTask<BrowserThemePack>;
   friend class BrowserThemePackTest;
 
diff --git a/chrome/browser/themes/browser_theme_pack_unittest.cc b/chrome/browser/themes/browser_theme_pack_unittest.cc
index 6251a73..4fa8441 100644
--- a/chrome/browser/themes/browser_theme_pack_unittest.cc
+++ b/chrome/browser/themes/browser_theme_pack_unittest.cc
@@ -19,6 +19,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/color_utils.h"
 
+using content::BrowserThread;
+
 class BrowserThemePackTest : public ::testing::Test {
  public:
   BrowserThemePackTest()
diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc
index c2c8d6a..1061c46 100644
--- a/chrome/browser/themes/theme_service.cc
+++ b/chrome/browser/themes/theme_service.cc
@@ -24,6 +24,8 @@
 #include "views/widget/native_widget_win.h"
 #endif
 
+using content::BrowserThread;
+
 // Strings used in alignment properties.
 const char* ThemeService::kAlignmentTop = "top";
 const char* ThemeService::kAlignmentBottom = "bottom";
diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc
index 36ee9fc..35bf60e 100644
--- a/chrome/browser/translate/translate_manager_browsertest.cc
+++ b/chrome/browser/translate/translate_manager_browsertest.cc
@@ -40,6 +40,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h"
 #include "third_party/cld/languages/public/languages.h"
 
+using content::BrowserThread;
 using testing::_;
 using testing::Pointee;
 using testing::Property;
diff --git a/chrome/browser/transport_security_persister.cc b/chrome/browser/transport_security_persister.cc
index 141a89d..36ccbff 100644
--- a/chrome/browser/transport_security_persister.cc
+++ b/chrome/browser/transport_security_persister.cc
@@ -13,6 +13,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "net/base/transport_security_state.h"
 
+using content::BrowserThread;
+
 class TransportSecurityPersister::Loader {
  public:
   Loader(const base::WeakPtr<TransportSecurityPersister>& persister,
diff --git a/chrome/browser/ui/auto_login_prompter.cc b/chrome/browser/ui/auto_login_prompter.cc
index 6d1aa8d..d031587 100644
--- a/chrome/browser/ui/auto_login_prompter.cc
+++ b/chrome/browser/ui/auto_login_prompter.cc
@@ -39,6 +39,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+using content::BrowserThread;
+
 // AutoLoginRedirector --------------------------------------------------------
 
 // This class is created by the AutoLoginInfoBarDelegate when the user wishes to
diff --git a/chrome/browser/ui/browser_close_browsertest.cc b/chrome/browser/ui/browser_close_browsertest.cc
index be7386c..f3a3dfe 100644
--- a/chrome/browser/ui/browser_close_browsertest.cc
+++ b/chrome/browser/ui/browser_close_browsertest.cc
@@ -27,6 +27,8 @@
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/common/page_transition_types.h"
 
+using content::BrowserThread;
+
 class BrowserCloseTest : public InProcessBrowserTest {
  public:
   // Structure defining test cases for DownloadsCloseCheck.
diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc
index 7aad216..7fa60491 100644
--- a/chrome/browser/ui/browser_init.cc
+++ b/chrome/browser/ui/browser_init.cc
@@ -111,6 +111,8 @@
 #include "ui/base/touch/touch_factory.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 // SetAsDefaultBrowserTask ----------------------------------------------------
diff --git a/chrome/browser/ui/cocoa/cocoa_profile_test.mm b/chrome/browser/ui/cocoa/cocoa_profile_test.mm
index 46f85d5..a0f07e0 100644
--- a/chrome/browser/ui/cocoa/cocoa_profile_test.mm
+++ b/chrome/browser/ui/cocoa/cocoa_profile_test.mm
@@ -8,6 +8,8 @@
 #include "chrome/test/base/testing_browser_process.h"
 #include "content/test/test_browser_thread.h"
 
+using content::BrowserThread;
+
 CocoaProfileTest::CocoaProfileTest()
     : ui_thread_(BrowserThread::UI, &message_loop_),
       profile_manager_(static_cast<TestingBrowserProcess*>(g_browser_process)),
diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm
index e5aa259..a57e2fb 100644
--- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm
+++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm
@@ -13,6 +13,8 @@
 #include "content/test/test_browser_thread.h"
 #include "chrome/test/base/testing_profile.h"
 
+using content::BrowserThread;
+
 namespace {
 
 class CollectedCookiesWindowControllerTest
diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm
index 6a5fb86..d643c2e 100644
--- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm
+++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm
@@ -17,6 +17,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace {
 
 class DummyContentSettingBubbleModel : public ContentSettingBubbleModel {
diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm
index 9a9f324..f20ae1a 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm
@@ -28,6 +28,7 @@
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
 
 // C++ class that receives EXTENSION_LOADED notifications and proxies them back
 // to |controller|.
diff --git a/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm b/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm
index 1461429..8f3edcf 100644
--- a/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm
@@ -14,6 +14,8 @@
 #include "chrome/test/base/testing_profile.h"
 #include "content/test/test_browser_thread.h"
 
+using content::BrowserThread;
+
 // Subclass balloon controller and mock out the initialization of the RVH.
 @interface TestBalloonController : BalloonController {
 }
diff --git a/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm b/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm
index cb44475..7c892ef 100644
--- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm
+++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm
@@ -23,6 +23,8 @@
 #include "net/base/x509_certificate.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
+using content::BrowserThread;
+
 @interface SFChooseIdentityPanel (SystemPrivate)
 // A system-private interface that dismisses a panel whose sheet was started by
 // beginSheetForWindow:modalDelegate:didEndSelector:contextInfo:identities:message:
diff --git a/chrome/browser/ui/cocoa/tabpose_window.mm b/chrome/browser/ui/cocoa/tabpose_window.mm
index 3a75527..9b6e800 100644
--- a/chrome/browser/ui/cocoa/tabpose_window.mm
+++ b/chrome/browser/ui/cocoa/tabpose_window.mm
@@ -41,6 +41,8 @@
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/scoped_cg_context_save_gstate_mac.h"
 
+using content::BrowserThread;
+
 // Height of the bottom gradient, in pixels.
 const CGFloat kBottomGradientHeight = 50;
 
diff --git a/chrome/browser/ui/constrained_window_tab_helper_unittest.cc b/chrome/browser/ui/constrained_window_tab_helper_unittest.cc
index 9e64185..89afe13 100644
--- a/chrome/browser/ui/constrained_window_tab_helper_unittest.cc
+++ b/chrome/browser/ui/constrained_window_tab_helper_unittest.cc
@@ -9,6 +9,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 class ConstrainedWindowTabHelperUnit : public TabContentsWrapperTestHarness {
  public:
   ConstrainedWindowTabHelperUnit()
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
index 33ce546..8945051 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
@@ -16,6 +16,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 class ContentSettingBubbleModelTest : public TabContentsWrapperTestHarness {
  protected:
   ContentSettingBubbleModelTest()
diff --git a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc
index 2709148..4516454 100644
--- a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc
+++ b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc
@@ -16,6 +16,8 @@
 #include "net/base/cookie_options.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 class ContentSettingImageModelTest : public TabContentsWrapperTestHarness {
  public:
   ContentSettingImageModelTest()
diff --git a/chrome/browser/ui/crypto_module_password_dialog_nss.cc b/chrome/browser/ui/crypto_module_password_dialog_nss.cc
index 6c4bf5a..3b699e5 100644
--- a/chrome/browser/ui/crypto_module_password_dialog_nss.cc
+++ b/chrome/browser/ui/crypto_module_password_dialog_nss.cc
@@ -16,6 +16,8 @@
 #include "crypto/nss_util.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 bool ShouldShowDialog(const net::CryptoModule* module) {
diff --git a/chrome/browser/ui/find_bar/find_backend_unittest.cc b/chrome/browser/ui/find_bar/find_backend_unittest.cc
index a5b0fd7..c1f4ceb 100644
--- a/chrome/browser/ui/find_bar/find_backend_unittest.cc
+++ b/chrome/browser/ui/find_bar/find_backend_unittest.cc
@@ -14,6 +14,8 @@
 #include "content/browser/tab_contents/test_tab_contents.h"
 #include "content/test/test_browser_thread.h"
 
+using content::BrowserThread;
+
 class FindBackendTest : public TabContentsWrapperTestHarness {
  public:
   FindBackendTest()
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc
index 1567f93..a48f587 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc
@@ -13,6 +13,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 // Dummy implementation that's good enough for the tests; we don't test
 // rendering here so all we need is a non-NULL object.
 class EmptyTabstripOriginProvider : public TabstripOriginProvider {
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc
index 8316d3d..999e242 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc
@@ -18,6 +18,7 @@
 using base::Time;
 using base::TimeDelta;
 using bookmark_utils::GetTitleFromTreeIter;
+using content::BrowserThread;
 
 // Base class for bookmark editor tests. This class is a copy from
 // bookmark_editor_view_unittest.cc, and all the tests in this file are
diff --git a/chrome/browser/ui/gtk/certificate_dialogs.cc b/chrome/browser/ui/gtk/certificate_dialogs.cc
index 0b2aa84..0dd9fa4 100644
--- a/chrome/browser/ui/gtk/certificate_dialogs.cc
+++ b/chrome/browser/ui/gtk/certificate_dialogs.cc
@@ -19,6 +19,8 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 namespace {
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/gtk/constrained_window_gtk.cc b/chrome/browser/ui/gtk/constrained_window_gtk.cc
index 56a5a85..ac57be3 100644
--- a/chrome/browser/ui/gtk/constrained_window_gtk.cc
+++ b/chrome/browser/ui/gtk/constrained_window_gtk.cc
@@ -24,6 +24,8 @@
 #include "chrome/browser/tab_contents/tab_contents_view_gtk.h"
 #endif
 
+using content::BrowserThread;
+
 ConstrainedWindowGtkDelegate::~ConstrainedWindowGtkDelegate() {
 }
 
diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc
index a1dbe87..6518d2c 100644
--- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc
@@ -27,6 +27,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/gtk_util.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Size (in pixels) of the icon preview.
diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h
index 12eaffc..3ac796b 100644
--- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h
+++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h
@@ -14,6 +14,8 @@
 #include "googleurl/src/gurl.h"
 #include "ui/base/gtk/gtk_signal.h"
 
+using content::BrowserThread;
+
 typedef struct _GdkPixbuf GdkPixbuf;
 typedef struct _GtkWidget GtkWidget;
 typedef struct _GtkWindow GtkWindow;
diff --git a/chrome/browser/ui/gtk/crypto_module_password_dialog.cc b/chrome/browser/ui/gtk/crypto_module_password_dialog.cc
index bdfe27a..e17522a 100644
--- a/chrome/browser/ui/gtk/crypto_module_password_dialog.cc
+++ b/chrome/browser/ui/gtk/crypto_module_password_dialog.cc
@@ -19,6 +19,8 @@
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 namespace {
 
 class CryptoModuleBlockingDialogDelegate
diff --git a/chrome/browser/ui/gtk/dialogs_common.cc b/chrome/browser/ui/gtk/dialogs_common.cc
index f792f0c..5f73a00 100644
--- a/chrome/browser/ui/gtk/dialogs_common.cc
+++ b/chrome/browser/ui/gtk/dialogs_common.cc
@@ -14,6 +14,8 @@
 #include "base/threading/thread_restrictions.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 FilePath* SelectFileDialogImpl::last_saved_path_ = NULL;
 FilePath* SelectFileDialogImpl::last_opened_path_ = NULL;
 
diff --git a/chrome/browser/ui/gtk/dialogs_kde.cc b/chrome/browser/ui/gtk/dialogs_kde.cc
index 9781df8..5cb98de 100644
--- a/chrome/browser/ui/gtk/dialogs_kde.cc
+++ b/chrome/browser/ui/gtk/dialogs_kde.cc
@@ -27,6 +27,8 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 // Implementation of SelectFileDialog that shows a KDE common dialog for
 // choosing a file or folder. This acts as a modal dialog.
 class SelectFileDialogImplKDE : public SelectFileDialogImpl {
diff --git a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc
index 8a07c1c..3897caa 100644
--- a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc
+++ b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc
@@ -30,6 +30,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/native_widget_types.h"
 
+using content::BrowserThread;
+
 namespace {
 
 enum {
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller_unittest.cc b/chrome/browser/ui/intents/web_intent_picker_controller_unittest.cc
index 33d9676..e191f50 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller_unittest.cc
+++ b/chrome/browser/ui/intents/web_intent_picker_controller_unittest.cc
@@ -27,6 +27,7 @@
 #include "ui/gfx/codec/png_codec.h"
 #include "webkit/glue/web_intent_service_data.h"
 
+using content::BrowserThread;
 using testing::_;
 using testing::AtMost;
 using testing::DoAll;
diff --git a/chrome/browser/ui/intents/web_intents_model_unittest.cc b/chrome/browser/ui/intents/web_intents_model_unittest.cc
index 5ada7f5..c42da98 100644
--- a/chrome/browser/ui/intents/web_intents_model_unittest.cc
+++ b/chrome/browser/ui/intents/web_intents_model_unittest.cc
@@ -14,6 +14,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/models/tree_node_model.h"
 
+using content::BrowserThread;
+
 class WebIntentsModelTest : public testing::Test {
  public:
   WebIntentsModelTest()
diff --git a/chrome/browser/ui/login/login_prompt.cc b/chrome/browser/ui/login/login_prompt.cc
index 36d3efd..6a459d8 100644
--- a/chrome/browser/ui/login/login_prompt.cc
+++ b/chrome/browser/ui/login/login_prompt.cc
@@ -29,6 +29,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/text/text_elider.h"
 
+using content::BrowserThread;
 using webkit_glue::PasswordForm;
 
 class LoginHandlerImpl;
diff --git a/chrome/browser/ui/login/login_prompt_gtk.cc b/chrome/browser/ui/login/login_prompt_gtk.cc
index 744c31a..1070117 100644
--- a/chrome/browser/ui/login/login_prompt_gtk.cc
+++ b/chrome/browser/ui/login/login_prompt_gtk.cc
@@ -26,6 +26,7 @@
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
 using webkit_glue::PasswordForm;
 
 // ----------------------------------------------------------------------------
diff --git a/chrome/browser/ui/login/login_prompt_mac.mm b/chrome/browser/ui/login/login_prompt_mac.mm
index 2c5c2ad..34c4275 100644
--- a/chrome/browser/ui/login/login_prompt_mac.mm
+++ b/chrome/browser/ui/login/login_prompt_mac.mm
@@ -24,6 +24,7 @@
 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
 using webkit_glue::PasswordForm;
 
 // ----------------------------------------------------------------------------
diff --git a/chrome/browser/ui/login/login_prompt_ui.cc b/chrome/browser/ui/login/login_prompt_ui.cc
index 28dfcc8..b938b49f 100644
--- a/chrome/browser/ui/login/login_prompt_ui.cc
+++ b/chrome/browser/ui/login/login_prompt_ui.cc
@@ -26,6 +26,8 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/size.h"
 
+using content::BrowserThread;
+
 class LoginHandlerSource : public ChromeURLDataManager::DataSource {
  public:
   LoginHandlerSource()
diff --git a/chrome/browser/ui/login/login_prompt_win.cc b/chrome/browser/ui/login/login_prompt_win.cc
index bd69bb8..0d1c9a2 100644
--- a/chrome/browser/ui/login/login_prompt_win.cc
+++ b/chrome/browser/ui/login/login_prompt_win.cc
@@ -21,6 +21,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "views/window/dialog_delegate.h"
 
+using content::BrowserThread;
 using webkit_glue::PasswordForm;
 
 // ----------------------------------------------------------------------------
diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc
index 602e6fa..a381cda 100644
--- a/chrome/browser/ui/panels/panel_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_browsertest.cc
@@ -30,6 +30,8 @@
 #include "content/public/common/url_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 class PanelBrowserTest : public BasePanelBrowserTest {
  public:
   PanelBrowserTest() : BasePanelBrowserTest() {
diff --git a/chrome/browser/ui/shell_dialogs_unittest.cc b/chrome/browser/ui/shell_dialogs_unittest.cc
index 0344dfc..8245699 100644
--- a/chrome/browser/ui/shell_dialogs_unittest.cc
+++ b/chrome/browser/ui/shell_dialogs_unittest.cc
@@ -17,6 +17,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 class FileSelectionUser : public SelectFileDialog::Listener {
  public:
   FileSelectionUser()
diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
index 7011399..31a9f3a 100644
--- a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
@@ -22,6 +22,8 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Creates a bitmap of the specified color.
diff --git a/chrome/browser/ui/toolbar/encoding_menu_controller_unittest.cc b/chrome/browser/ui/toolbar/encoding_menu_controller_unittest.cc
index f521b17..7be469d 100644
--- a/chrome/browser/ui/toolbar/encoding_menu_controller_unittest.cc
+++ b/chrome/browser/ui/toolbar/encoding_menu_controller_unittest.cc
@@ -15,6 +15,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 class EncodingMenuControllerTest : public testing::Test {
  public:
   EncodingMenuControllerTest()
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
index 0bf9d01..9dfc225 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
@@ -36,6 +36,8 @@
 #include "views/views_delegate.h"
 #include "views/widget/widget.h"
 
+using content::BrowserThread;
+
 #if defined(OS_LINUX)
 // See http://crbug.com/40040 for details.
 #define MAYBE_DND DISABLED_DND
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc
index c9c842b..0e317f9 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc
@@ -23,6 +23,8 @@
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 // PageNavigator implementation that records the URL.
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc
index 5a0299b..6907a8b 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc
@@ -16,6 +16,7 @@
 
 using base::Time;
 using base::TimeDelta;
+using content::BrowserThread;
 
 // Base class for bookmark editor tests. Creates a BookmarkModel and populates
 // it with test data.
diff --git a/chrome/browser/ui/views/file_manager_dialog.cc b/chrome/browser/ui/views/file_manager_dialog.cc
index 0d040f1..7e2aa57 100644
--- a/chrome/browser/ui/views/file_manager_dialog.cc
+++ b/chrome/browser/ui/views/file_manager_dialog.cc
@@ -20,6 +20,8 @@
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace {
 
 const int kFileManagerWidth = 720;  // pixels
diff --git a/chrome/browser/ui/views/select_file_dialog.cc b/chrome/browser/ui/views/select_file_dialog.cc
index 80da6ef..288d2ed 100644
--- a/chrome/browser/ui/views/select_file_dialog.cc
+++ b/chrome/browser/ui/views/select_file_dialog.cc
@@ -25,6 +25,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "views/window/non_client_view.h"
 
+using content::BrowserThread;
+
 namespace {
 
 const char kKeyNamePath[] = "path";
diff --git a/chrome/browser/ui/views/shell_dialogs_aura.cc b/chrome/browser/ui/views/shell_dialogs_aura.cc
index 365fb4b..a0753ee 100644
--- a/chrome/browser/ui/views/shell_dialogs_aura.cc
+++ b/chrome/browser/ui/views/shell_dialogs_aura.cc
@@ -7,6 +7,8 @@
 #include "chrome/browser/ui/views/file_manager_dialog.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 // static
 SelectFileDialog* SelectFileDialog::Create(Listener* listener) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
diff --git a/chrome/browser/ui/views/shell_dialogs_win.cc b/chrome/browser/ui/views/shell_dialogs_win.cc
index 1ddb1dd..faa4cb9 100644
--- a/chrome/browser/ui/views/shell_dialogs_win.cc
+++ b/chrome/browser/ui/views/shell_dialogs_win.cc
@@ -27,6 +27,8 @@
 #include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 // This function takes the output of a SaveAs dialog: a filename, a filter and
 // the extension originally suggested to the user (shown in the dialog box) and
 // returns back the filename with the appropriate extension tacked on. If the
diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.cc b/chrome/browser/ui/views/ssl_client_certificate_selector.cc
index eb7b08f..a3d1433 100644
--- a/chrome/browser/ui/views/ssl_client_certificate_selector.cc
+++ b/chrome/browser/ui/views/ssl_client_certificate_selector.cc
@@ -25,6 +25,8 @@
 #include "views/layout/grid_layout.h"
 #include "views/layout/layout_constants.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // The dimensions of the certificate selector table view, in pixels.
diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc
index 69596b8..f4e0336 100644
--- a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc
+++ b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc
@@ -21,6 +21,7 @@
 
 using ::testing::Mock;
 using ::testing::StrictMock;
+using content::BrowserThread;
 
 // We don't have a way to do end-to-end SSL client auth testing, so this test
 // creates a certificate selector_ manually with a mocked
diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc
index d8efac1..49c4ee7 100644
--- a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc
+++ b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc
@@ -30,6 +30,7 @@
 #include "views/drag_utils.h"
 #include "webkit/glue/webdropdata.h"
 
+using content::BrowserThread;
 using WebKit::WebDragOperationsMask;
 using WebKit::WebDragOperationCopy;
 using WebKit::WebDragOperationLink;
diff --git a/chrome/browser/ui/web_applications/web_app_ui.cc b/chrome/browser/ui/web_applications/web_app_ui.cc
index 70712d9..a1bd2f4 100644
--- a/chrome/browser/ui/web_applications/web_app_ui.cc
+++ b/chrome/browser/ui/web_applications/web_app_ui.cc
@@ -26,6 +26,8 @@
 #include "base/environment.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 #if defined(OS_WIN)
diff --git a/chrome/browser/ui/webui/bug_report_ui.cc b/chrome/browser/ui/webui/bug_report_ui.cc
index 7a1b428..c324e2b 100644
--- a/chrome/browser/ui/webui/bug_report_ui.cc
+++ b/chrome/browser/ui/webui/bug_report_ui.cc
@@ -43,6 +43,8 @@
 #include "chrome/browser/chromeos/system/syslogs_provider.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 const char kScreenshotBaseUrl[] = "chrome://screenshots/";
diff --git a/chrome/browser/ui/webui/chrome_url_data_manager.cc b/chrome/browser/ui/webui/chrome_url_data_manager.cc
index 408de1d..23b61e7 100644
--- a/chrome/browser/ui/webui/chrome_url_data_manager.cc
+++ b/chrome/browser/ui/webui/chrome_url_data_manager.cc
@@ -25,6 +25,8 @@
 #include "base/win/windows_version.h"
 #endif
 
+using content::BrowserThread;
+
 // static
 base::Lock ChromeURLDataManager::delete_lock_;
 
diff --git a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc
index b7a5881..51ddb00 100644
--- a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc
+++ b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc
@@ -37,6 +37,8 @@
 #include "net/url_request/url_request_job_factory.h"
 #include "webkit/appcache/view_appcache_internals_job.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // X-WebKit-CSP is our development name for Content-Security-Policy.
diff --git a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc
index e61afe8..ec3ec6b 100644
--- a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc
@@ -26,6 +26,8 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/bytes_formatting.h"
 
+using content::BrowserThread;
+
 namespace {
 
 const char kPropertyDevicePath[] = "devicePath";
diff --git a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_utils.cc b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_utils.cc
index c13f882..8bec8d5 100644
--- a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_utils.cc
+++ b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_utils.cc
@@ -13,6 +13,8 @@
 #include "content/browser/download/download_types.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 namespace imageburner {
 
 static const char kConfigFileUrl[] =
diff --git a/chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h b/chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h
index ee03ab5..281cf98 100644
--- a/chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h
+++ b/chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h
@@ -23,6 +23,8 @@
 #include "content/browser/tab_contents/tab_contents.h"
 #include "googleurl/src/gurl.h"
 
+using content::BrowserThread;
+
 namespace imageburner {
 
 enum ProgressType {
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index 519f47d..0561932 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -35,6 +35,8 @@
 #include "net/base/dnsrr_resolver.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 namespace {
 
 const char kDefaultDomain[] = "@gmail.com";
diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc
index a271ca2..64a753d 100644
--- a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc
+++ b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc
@@ -16,6 +16,8 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 class MobileSetupDialogDelegate : public HtmlDialogUIDelegate {
  public:
   static MobileSetupDialogDelegate* GetInstance();
diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
index 3482dce..2f5e7fb 100644
--- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
@@ -43,6 +43,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Host page JS API function names.
diff --git a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc
index ae0da5c..22b0690 100644
--- a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc
@@ -28,6 +28,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // JS API callbacks names.
diff --git a/chrome/browser/ui/webui/cloud_print_signin_dialog.cc b/chrome/browser/ui/webui/cloud_print_signin_dialog.cc
index d8fdd28..20f3bfc 100644
--- a/chrome/browser/ui/webui/cloud_print_signin_dialog.cc
+++ b/chrome/browser/ui/webui/cloud_print_signin_dialog.cc
@@ -22,6 +22,8 @@
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 
+using content::BrowserThread;
+
 // This module implements a sign in dialog for cloud print.
 // it is based heavily off "chrome/browser/printing/print_dialog_cloud.cc".
 // See the comments in that file for a discussion about how this works.
diff --git a/chrome/browser/ui/webui/devtools_ui.cc b/chrome/browser/ui/webui/devtools_ui.cc
index e666094..8a66808 100644
--- a/chrome/browser/ui/webui/devtools_ui.cc
+++ b/chrome/browser/ui/webui/devtools_ui.cc
@@ -19,6 +19,8 @@
 #include "grit/devtools_resources_map.h"
 #include "ui/base/resource/resource_bundle.h"
 
+using content::BrowserThread;
+
 namespace {
 
 std::string PathWithoutParams(const std::string& path) {
diff --git a/chrome/browser/ui/webui/downloads_dom_handler.cc b/chrome/browser/ui/webui/downloads_dom_handler.cc
index c4af116..8e7cc4e 100644
--- a/chrome/browser/ui/webui/downloads_dom_handler.cc
+++ b/chrome/browser/ui/webui/downloads_dom_handler.cc
@@ -39,6 +39,8 @@
 #include "content/public/browser/browser_thread.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 // Maximum number of downloads to show. TODO(glen): Remove this and instead
diff --git a/chrome/browser/ui/webui/gpu_internals_ui.cc b/chrome/browser/ui/webui/gpu_internals_ui.cc
index bdadcb7..cb9087b 100644
--- a/chrome/browser/ui/webui/gpu_internals_ui.cc
+++ b/chrome/browser/ui/webui/gpu_internals_ui.cc
@@ -26,6 +26,8 @@
 #include "third_party/angle/src/common/version.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 namespace {
 
 ChromeWebUIDataSource* CreateGpuHTMLSource() {
diff --git a/chrome/browser/ui/webui/media/media_internals_handler.cc b/chrome/browser/ui/webui/media/media_internals_handler.cc
index 910f9e4..6798ad5 100644
--- a/chrome/browser/ui/webui/media/media_internals_handler.cc
+++ b/chrome/browser/ui/webui/media/media_internals_handler.cc
@@ -13,6 +13,8 @@
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 MediaInternalsMessageHandler::MediaInternalsMessageHandler()
     : proxy_(new MediaInternalsProxy()) {}
 
diff --git a/chrome/browser/ui/webui/media/media_internals_proxy.cc b/chrome/browser/ui/webui/media/media_internals_proxy.cc
index c04bc0c..928a019 100644
--- a/chrome/browser/ui/webui/media/media_internals_proxy.cc
+++ b/chrome/browser/ui/webui/media/media_internals_proxy.cc
@@ -13,6 +13,8 @@
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/public/browser/notification_types.h"
 
+using content::BrowserThread;
+
 static const int kMediaInternalsProxyEventDelayMilliseconds = 100;
 
 static const net::NetLog::EventType kNetEventTypeFilter[] = {
diff --git a/chrome/browser/ui/webui/media/media_internals_proxy.h b/chrome/browser/ui/webui/media/media_internals_proxy.h
index 6350a3b..89f228d 100644
--- a/chrome/browser/ui/webui/media/media_internals_proxy.h
+++ b/chrome/browser/ui/webui/media/media_internals_proxy.h
@@ -28,8 +28,9 @@ class Value;
 // threads before destruction.
 class MediaInternalsProxy
     : public MediaInternalsObserver,
-      public base::RefCountedThreadSafe<MediaInternalsProxy,
-                                        BrowserThread::DeleteOnUIThread>,
+      public base::RefCountedThreadSafe<
+          MediaInternalsProxy,
+          content::BrowserThread::DeleteOnUIThread>,
       public ChromeNetLog::ThreadSafeObserverImpl,
       public content::NotificationObserver {
  public:
@@ -60,7 +61,8 @@ class MediaInternalsProxy
                           net::NetLog::EventParameters* params) OVERRIDE;
 
  private:
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
+  friend struct content::BrowserThread::DeleteOnThread<
+      content::BrowserThread::UI>;
   friend class DeleteTask<MediaInternalsProxy>;
   virtual ~MediaInternalsProxy();
 
diff --git a/chrome/browser/ui/webui/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals_ui.cc
index 0e24eee..e873fc4 100644
--- a/chrome/browser/ui/webui/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals_ui.cc
@@ -71,6 +71,8 @@
 #include "chrome/browser/net/service_providers_win.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 // Delay between when an event occurs and when it is passed to the Javascript
diff --git a/chrome/browser/ui/webui/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals_ui_browsertest.cc
index ec7427b..45d5b36 100644
--- a/chrome/browser/ui/webui/net_internals_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/net_internals_ui_browsertest.cc
@@ -31,6 +31,8 @@
 #include "net/url_request/url_request_context_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Called on IO thread.  Adds an entry to the cache for the specified hostname.
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc
index 1353623..a5ed004 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc
+++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc
@@ -51,6 +51,8 @@
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // The amount of time there must be no painting for us to consider painting
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
index 4c317d8..64a42ae 100644
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -60,6 +60,7 @@
 #endif
 
 using base::Time;
+using content::BrowserThread;
 
 namespace {
 
diff --git a/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc b/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc
index e67c2bf..fd07b1a 100644
--- a/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc
+++ b/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc
@@ -17,6 +17,8 @@
 #include "content/common/process_watcher.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
+
 // Command used to configure GNOME 2 proxy settings.
 const char* kGNOME2ProxyConfigCommand[] = {"gnome-network-properties", NULL};
 // In GNOME 3, we might need to run gnome-control-center instead. We try this
diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.cc b/chrome/browser/ui/webui/options/certificate_manager_handler.cc
index 0d3dbf2..abe0c7d 100644
--- a/chrome/browser/ui/webui/options/certificate_manager_handler.cc
+++ b/chrome/browser/ui/webui/options/certificate_manager_handler.cc
@@ -29,6 +29,8 @@
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 static const char kKeyId[] = "id";
diff --git a/chrome/browser/ui/webui/options/chromeos/system_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/system_options_handler.cc
index 18d282d8..30a353a 100644
--- a/chrome/browser/ui/webui/options/chromeos/system_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/system_options_handler.cc
@@ -36,6 +36,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+using content::BrowserThread;
+
 namespace {
 
 void TouchpadExistsFileThread(bool* exists) {
diff --git a/chrome/browser/ui/webui/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview_handler.cc
index b134c60..66e4aa3 100644
--- a/chrome/browser/ui/webui/print_preview_handler.cc
+++ b/chrome/browser/ui/webui/print_preview_handler.cc
@@ -58,6 +58,8 @@
 #include "chrome/common/chrome_switches.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 enum UserActionBuckets {
diff --git a/chrome/browser/ui/webui/quota_internals_proxy.cc b/chrome/browser/ui/webui/quota_internals_proxy.cc
index e217d37..100f6d5 100644
--- a/chrome/browser/ui/webui/quota_internals_proxy.cc
+++ b/chrome/browser/ui/webui/quota_internals_proxy.cc
@@ -12,6 +12,8 @@
 #include "chrome/browser/ui/webui/quota_internals_types.h"
 #include "net/base/net_util.h"
 
+using content::BrowserThread;
+
 namespace quota_internals {
 
 QuotaInternalsProxy::QuotaInternalsProxy(QuotaInternalsHandler* handler)
diff --git a/chrome/browser/ui/webui/quota_internals_proxy.h b/chrome/browser/ui/webui/quota_internals_proxy.h
index 7eca9a5..97e51cf 100644
--- a/chrome/browser/ui/webui/quota_internals_proxy.h
+++ b/chrome/browser/ui/webui/quota_internals_proxy.h
@@ -29,8 +29,9 @@ typedef std::map<std::string, std::string> Statistics;
 // Each QuotaInternalsHandler instances creates and owns a instance of this
 // class.
 class QuotaInternalsProxy
-    : public base::RefCountedThreadSafe<QuotaInternalsProxy,
-                                        BrowserThread::DeleteOnIOThread> {
+    : public base::RefCountedThreadSafe<
+          QuotaInternalsProxy,
+          content::BrowserThread::DeleteOnIOThread> {
  public:
   explicit QuotaInternalsProxy(QuotaInternalsHandler* handler);
   ~QuotaInternalsProxy();
@@ -77,7 +78,8 @@ class QuotaInternalsProxy
   std::vector<PerHostStorageInfo> report_pending_;
 
   friend class QuotaInternalsHandler;
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::IO>;
+  friend struct content::BrowserThread::DeleteOnThread<
+      content::BrowserThread::IO>;
   friend class DeleteTask<QuotaInternalsProxy>;
 
   DISALLOW_COPY_AND_ASSIGN(QuotaInternalsProxy);
diff --git a/chrome/browser/ui/webui/screenshot_source.cc b/chrome/browser/ui/webui/screenshot_source.cc
index 0d30a19..97338da 100644
--- a/chrome/browser/ui/webui/screenshot_source.cc
+++ b/chrome/browser/ui/webui/screenshot_source.cc
@@ -69,6 +69,7 @@ void ScreenshotSource::SendScreenshot(const std::string& screenshot_path,
 #if defined(OS_CHROMEOS)
   } else if (path.compare(0, strlen(kSavedScreenshotsBasePath),
                           kSavedScreenshotsBasePath) == 0) {
+    using content::BrowserThread;
     BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
                             base::Bind(&ScreenshotSource::SendSavedScreenshot,
                                        base::Unretained(this), path,
diff --git a/chrome/browser/ui/webui/sync_internals_ui_unittest.cc b/chrome/browser/ui/webui/sync_internals_ui_unittest.cc
index 442155b..9e5fe31 100644
--- a/chrome/browser/ui/webui/sync_internals_ui_unittest.cc
+++ b/chrome/browser/ui/webui/sync_internals_ui_unittest.cc
@@ -26,6 +26,7 @@ namespace {
 using browser_sync::HasArgsAsList;
 using browser_sync::JsArgList;
 using browser_sync::JsEventDetails;
+using content::BrowserThread;
 using testing::_;
 using testing::Mock;
 using testing::NiceMock;
diff --git a/chrome/browser/ui/webui/task_manager_dialog.cc b/chrome/browser/ui/webui/task_manager_dialog.cc
index bea6cb2..3f5c9e7 100644
--- a/chrome/browser/ui/webui/task_manager_dialog.cc
+++ b/chrome/browser/ui/webui/task_manager_dialog.cc
@@ -20,6 +20,8 @@
 #include "views/widget/widget.h"
 #endif
 
+using content::BrowserThread;
+
 class TaskManagerDialogImpl : public HtmlDialogUIDelegate {
  public:
   TaskManagerDialogImpl();
diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc
index f33b546..bc07fff 100644
--- a/chrome/browser/ui/webui/theme_source.cc
+++ b/chrome/browser/ui/webui/theme_source.cc
@@ -18,6 +18,8 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 
+using content::BrowserThread;
+
 // use a resource map rather than hard-coded strings.
 static const char* kNewTabCSSPath = "css/newtab.css";
 static const char* kNewIncognitoTabCSSPath = "css/newincognitotab.css";
diff --git a/chrome/browser/ui/webui/theme_source_unittest.cc b/chrome/browser/ui/webui/theme_source_unittest.cc
index 1355216..51f4107 100644
--- a/chrome/browser/ui/webui/theme_source_unittest.cc
+++ b/chrome/browser/ui/webui/theme_source_unittest.cc
@@ -12,6 +12,8 @@
 #include "grit/theme_resources_standard.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 // A mock ThemeSource (so we can override SendResponse to get at its data).
 class MockThemeSource : public ThemeSource {
  public:
diff --git a/chrome/browser/ui/webui/tracing_ui.cc b/chrome/browser/ui/webui/tracing_ui.cc
index f314ed9..05456ec 100644
--- a/chrome/browser/ui/webui/tracing_ui.cc
+++ b/chrome/browser/ui/webui/tracing_ui.cc
@@ -27,6 +27,8 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserThread;
+
 namespace {
 
 ChromeWebUIDataSource* CreateTracingHTMLSource() {
diff --git a/chrome/browser/ui/webui/tracking_ui.cc b/chrome/browser/ui/webui/tracking_ui.cc
index 76bb088..44aa0db 100644
--- a/chrome/browser/ui/webui/tracking_ui.cc
+++ b/chrome/browser/ui/webui/tracking_ui.cc
@@ -16,6 +16,8 @@
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 
+using content::BrowserThread;
+
 namespace {
 
 ChromeWebUIDataSource* CreateTrackingHTMLSource() {
diff --git a/chrome/browser/ui/webui/web_ui_unittest.cc b/chrome/browser/ui/webui/web_ui_unittest.cc
index 0bbdfe0..19e15e8 100644
--- a/chrome/browser/ui/webui/web_ui_unittest.cc
+++ b/chrome/browser/ui/webui/web_ui_unittest.cc
@@ -14,6 +14,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 class WebUITest : public TabContentsWrapperTestHarness {
  public:
   WebUITest() : ui_thread_(BrowserThread::UI, MessageLoop::current()) {}
diff --git a/chrome/browser/ui/webui/workers_ui.cc b/chrome/browser/ui/webui/workers_ui.cc
index d3ade6d..877e2abd 100644
--- a/chrome/browser/ui/webui/workers_ui.cc
+++ b/chrome/browser/ui/webui/workers_ui.cc
@@ -28,6 +28,8 @@
 #include "grit/workers_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
+using content::BrowserThread;
+
 static const char kWorkersDataFile[] = "workers_data.json";
 
 static const char kOpenDevToolsCommand[]  = "openDevTools";
diff --git a/chrome/browser/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector_impl.cc
index a2db8bc..3b04012 100644
--- a/chrome/browser/upgrade_detector_impl.cc
+++ b/chrome/browser/upgrade_detector_impl.cc
@@ -29,6 +29,8 @@
 #include "base/version.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 // How long (in milliseconds) to wait (each cycle) before checking whether
diff --git a/chrome/browser/user_style_sheet_watcher.cc b/chrome/browser/user_style_sheet_watcher.cc
index 49fec0a..de7552d 100644
--- a/chrome/browser/user_style_sheet_watcher.cc
+++ b/chrome/browser/user_style_sheet_watcher.cc
@@ -13,6 +13,7 @@
 #include "content/public/browser/notification_types.h"
 
 using ::base::files::FilePathWatcher;
+using content::BrowserThread;
 
 namespace {
 
diff --git a/chrome/browser/user_style_sheet_watcher.h b/chrome/browser/user_style_sheet_watcher.h
index 8b0296a..4fd0243 100644
--- a/chrome/browser/user_style_sheet_watcher.h
+++ b/chrome/browser/user_style_sheet_watcher.h
@@ -21,8 +21,9 @@ class UserStyleSheetLoader;
 // Watches the user style sheet file and triggers reloads on the file thread
 // whenever the file changes.
 class UserStyleSheetWatcher
-    : public base::RefCountedThreadSafe<UserStyleSheetWatcher,
-                                        BrowserThread::DeleteOnUIThread>,
+    : public base::RefCountedThreadSafe<
+          UserStyleSheetWatcher,
+          content::BrowserThread::DeleteOnUIThread>,
       public content::NotificationObserver {
  public:
   UserStyleSheetWatcher(Profile* profile, const FilePath& profile_path);
@@ -37,7 +38,8 @@ class UserStyleSheetWatcher
                        const content::NotificationDetails& details);
 
  private:
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
+  friend struct content::BrowserThread::DeleteOnThread<
+      content::BrowserThread::UI>;
   friend class DeleteTask<UserStyleSheetWatcher>;
 
   virtual ~UserStyleSheetWatcher();
diff --git a/chrome/browser/user_style_sheet_watcher_unittest.cc b/chrome/browser/user_style_sheet_watcher_unittest.cc
index 5a90d44..ea1eefb 100644
--- a/chrome/browser/user_style_sheet_watcher_unittest.cc
+++ b/chrome/browser/user_style_sheet_watcher_unittest.cc
@@ -15,6 +15,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 TEST(UserStyleSheetWatcherTest, StyleLoad) {
   ScopedTempDir dir;
   ASSERT_TRUE(dir.CreateUniqueTempDir());
diff --git a/chrome/browser/visitedlink/visitedlink_master.cc b/chrome/browser/visitedlink/visitedlink_master.cc
index 966bd39..10a6750 100644
--- a/chrome/browser/visitedlink/visitedlink_master.cc
+++ b/chrome/browser/visitedlink/visitedlink_master.cc
@@ -26,6 +26,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::BrowserThread;
 using file_util::ScopedFILE;
 using file_util::OpenFile;
 using file_util::TruncateFile;
diff --git a/chrome/browser/visitedlink/visitedlink_unittest.cc b/chrome/browser/visitedlink/visitedlink_unittest.cc
index 07deff2..43e93a1 100644
--- a/chrome/browser/visitedlink/visitedlink_unittest.cc
+++ b/chrome/browser/visitedlink/visitedlink_unittest.cc
@@ -25,6 +25,8 @@
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // a nice long URL that we can append numbers to to get new URLs
diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc
index b636403..cd8a39f 100644
--- a/chrome/browser/web_applications/web_app.cc
+++ b/chrome/browser/web_applications/web_app.cc
@@ -31,6 +31,8 @@
 #include "ui/gfx/icon_util.h"
 #endif  // defined(OS_WIN)
 
+using content::BrowserThread;
+
 namespace {
 
 #if defined(OS_WIN)
diff --git a/chrome/browser/web_applications/web_app_unittest.cc b/chrome/browser/web_applications/web_app_unittest.cc
index be6ece0..73f8a88 100644
--- a/chrome/browser/web_applications/web_app_unittest.cc
+++ b/chrome/browser/web_applications/web_app_unittest.cc
@@ -14,6 +14,8 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
+
 class WebApplicationTest : public TabContentsWrapperTestHarness {
  public:
   WebApplicationTest() : ui_thread_(BrowserThread::UI, &message_loop_) {
diff --git a/chrome/browser/web_resource/gpu_blacklist_updater.cc b/chrome/browser/web_resource/gpu_blacklist_updater.cc
index 1ae31389..9dc5f1e 100644
--- a/chrome/browser/web_resource/gpu_blacklist_updater.cc
+++ b/chrome/browser/web_resource/gpu_blacklist_updater.cc
@@ -24,6 +24,8 @@
 #include "ui/gfx/gl/gl_implementation.h"
 #include "ui/gfx/gl/gl_switches.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Delay on first fetch so we don't interfere with startup.
diff --git a/chrome/browser/web_resource/web_resource_service.cc b/chrome/browser/web_resource/web_resource_service.cc
index 50841f9..ea9bffc 100644
--- a/chrome/browser/web_resource/web_resource_service.cc
+++ b/chrome/browser/web_resource/web_resource_service.cc
@@ -28,6 +28,8 @@
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_status.h"
 
+using content::BrowserThread;
+
 class WebResourceService::WebResourceFetcher
     : public content::URLFetcherDelegate {
  public:
diff --git a/chrome/browser/webdata/autofill_profile_syncable_service.cc b/chrome/browser/webdata/autofill_profile_syncable_service.cc
index 99d42c6..028044c 100644
--- a/chrome/browser/webdata/autofill_profile_syncable_service.cc
+++ b/chrome/browser/webdata/autofill_profile_syncable_service.cc
@@ -20,6 +20,8 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // Helper to compare the local value and cloud value of a field, merge into
diff --git a/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc b/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc
index 089e24c..a59dff1 100644
--- a/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc
+++ b/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc
@@ -20,6 +20,7 @@ using ::testing::DoAll;
 using ::testing::Eq;
 using ::testing::Return;
 using ::testing::Property;
+using content::BrowserThread;
 class AutofillProfile;
 
 class MockAutofillProfileSyncableService
diff --git a/chrome/browser/webdata/web_data_service.cc b/chrome/browser/webdata/web_data_service.cc
index 851f5a6..8c687c9 100644
--- a/chrome/browser/webdata/web_data_service.cc
+++ b/chrome/browser/webdata/web_data_service.cc
@@ -43,6 +43,7 @@
 
 using base::Bind;
 using base::Time;
+using content::BrowserThread;
 using webkit_glue::FormField;
 using webkit_glue::PasswordForm;
 using webkit_glue::WebIntentServiceData;
diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h
index d2df94a..bbaaad6 100644
--- a/chrome/browser/webdata/web_data_service.h
+++ b/chrome/browser/webdata/web_data_service.h
@@ -171,8 +171,8 @@ template <class T> class WDObjectResult : public WDTypedResult {
 class WebDataServiceConsumer;
 
 class WebDataService
-    : public base::RefCountedThreadSafe<WebDataService,
-                                        BrowserThread::DeleteOnUIThread> {
+    : public base::RefCountedThreadSafe<
+          WebDataService, content::BrowserThread::DeleteOnUIThread> {
  public:
   // All requests return an opaque handle of the following type.
   typedef int Handle;
@@ -552,7 +552,8 @@ class WebDataService
   //
   //////////////////////////////////////////////////////////////////////////////
  private:
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
+  friend struct content::BrowserThread::DeleteOnThread<
+      content::BrowserThread::UI>;
   friend class DeleteTask<WebDataService>;
   friend class ShutdownTask;
 
diff --git a/chrome/browser/webdata/web_data_service_test_util.h b/chrome/browser/webdata/web_data_service_test_util.h
index 0a3b2e5..b7c5320 100644
--- a/chrome/browser/webdata/web_data_service_test_util.h
+++ b/chrome/browser/webdata/web_data_service_test_util.h
@@ -19,6 +19,7 @@ class AutofillWebDataServiceConsumer: public WebDataServiceConsumer {
 
   virtual void OnWebDataServiceRequestDone(WebDataService::Handle handle,
                                            const WDTypedResult* result) {
+    using content::BrowserThread;
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     handle_ = handle;
     const WDResult<T>* wrapped_result =
diff --git a/chrome/browser/webdata/web_data_service_unittest.cc b/chrome/browser/webdata/web_data_service_unittest.cc
index a9003a4..60c1b71 100644
--- a/chrome/browser/webdata/web_data_service_unittest.cc
+++ b/chrome/browser/webdata/web_data_service_unittest.cc
@@ -38,6 +38,7 @@
 using base::Time;
 using base::TimeDelta;
 using base::WaitableEvent;
+using content::BrowserThread;
 using testing::_;
 using testing::DoDefault;
 using testing::ElementsAreArray;
diff --git a/chrome/browser/webdata/web_database_migration_unittest.cc b/chrome/browser/webdata/web_database_migration_unittest.cc
index a9e4b9d..9259e8f 100644
--- a/chrome/browser/webdata/web_database_migration_unittest.cc
+++ b/chrome/browser/webdata/web_database_migration_unittest.cc
@@ -27,6 +27,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
+using content::BrowserThread;
 
 namespace {
 
diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc
index b3b2738..3b01691 100644
--- a/chrome/test/base/browser_with_test_window_test.cc
+++ b/chrome/test/base/browser_with_test_window_test.cc
@@ -18,6 +18,8 @@
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/common/page_transition_types.h"
 
+using content::BrowserThread;
+
 BrowserWithTestWindowTest::BrowserWithTestWindowTest()
     : ui_thread_(BrowserThread::UI, message_loop()),
       file_thread_(BrowserThread::FILE, message_loop()),
diff --git a/chrome/test/base/test_url_request_context_getter.cc b/chrome/test/base/test_url_request_context_getter.cc
index c3c84aa..4cd0a89 100644
--- a/chrome/test/base/test_url_request_context_getter.cc
+++ b/chrome/test/base/test_url_request_context_getter.cc
@@ -7,6 +7,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "net/url_request/url_request_test_util.h"
 
+using content::BrowserThread;
+
 TestURLRequestContextGetter::TestURLRequestContextGetter() {}
 
 TestURLRequestContextGetter::~TestURLRequestContextGetter() {}
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index b5238a0..e9b8805 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -63,6 +63,7 @@
 #include "webkit/quota/quota_manager.h"
 
 using base::Time;
+using content::BrowserThread;
 using testing::NiceMock;
 using testing::Return;
 
diff --git a/chrome/test/base/thread_observer_helper.h b/chrome/test/base/thread_observer_helper.h
index 4c22123..bbfc40f 100644
--- a/chrome/test/base/thread_observer_helper.h
+++ b/chrome/test/base/thread_observer_helper.h
@@ -17,10 +17,11 @@
 template <class T, typename Traits>
 class ThreadObserverHelper : public base::RefCountedThreadSafe<T, Traits> {
  public:
-  explicit ThreadObserverHelper(BrowserThread::ID id)
+  explicit ThreadObserverHelper(content::BrowserThread::ID id)
       : id_(id), done_event_(false, false) {}
 
   void Init() {
+    using content::BrowserThread;
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     BrowserThread::PostTask(
         id_,
@@ -30,7 +31,7 @@ class ThreadObserverHelper : public base::RefCountedThreadSafe<T, Traits> {
   }
 
   virtual ~ThreadObserverHelper() {
-    DCHECK(BrowserThread::CurrentlyOn(id_));
+    DCHECK(content::BrowserThread::CurrentlyOn(id_));
     registrar_.RemoveAll();
   }
 
@@ -48,23 +49,24 @@ class ThreadObserverHelper : public base::RefCountedThreadSafe<T, Traits> {
 
  private:
   void RegisterObserversTask() {
-    DCHECK(BrowserThread::CurrentlyOn(id_));
+    DCHECK(content::BrowserThread::CurrentlyOn(id_));
     RegisterObservers();
     done_event_.Signal();
   }
 
-  BrowserThread::ID id_;
+  content::BrowserThread::ID id_;
   base::WaitableEvent done_event_;
 };
 
 class DBThreadObserverHelper;
 typedef ThreadObserverHelper<
     DBThreadObserverHelper,
-    BrowserThread::DeleteOnDBThread> DBThreadObserverHelperBase;
+    content::BrowserThread::DeleteOnDBThread> DBThreadObserverHelperBase;
 
 class DBThreadObserverHelper : public DBThreadObserverHelperBase {
  public:
-  DBThreadObserverHelper() : DBThreadObserverHelperBase(BrowserThread::DB) {}
+  DBThreadObserverHelper() :
+      DBThreadObserverHelperBase(content::BrowserThread::DB) {}
 };
 
 #endif  // CHROME_TEST_BASE_THREAD_OBSERVER_HELPER_H_
diff --git a/chrome/tools/profiles/generate_profile.cc b/chrome/tools/profiles/generate_profile.cc
index 7f07110..adebcd9 100644
--- a/chrome/tools/profiles/generate_profile.cc
+++ b/chrome/tools/profiles/generate_profile.cc
@@ -31,6 +31,7 @@
 #include "ui/gfx/codec/jpeg_codec.h"
 
 using base::Time;
+using content::BrowserThread;
 
 // Addition types data can be generated for. By default only urls/visits are
 // added.
@@ -235,8 +236,8 @@ int main(int argc, const char* argv[]) {
   ResourceBundle::InitSharedInstance("en-US");
   NotificationServiceImpl notification_service;
   MessageLoopForUI message_loop;
-  DeprecatedBrowserThread ui_thread(BrowserThread::UI, &message_loop);
-  DeprecatedBrowserThread db_thread(BrowserThread::DB, &message_loop);
+  content::DeprecatedBrowserThread ui_thread(BrowserThread::UI, &message_loop);
+  content::DeprecatedBrowserThread db_thread(BrowserThread::DB, &message_loop);
   TestingProfile profile;
   profile.CreateHistoryService(false, false);
   if (types & TOP_SITES) {
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index 7129c91..a454435 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -55,6 +55,8 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 
+using content::BrowserThread;
+
 namespace {
 
 // A special command line switch to allow developers to manually launch the
@@ -304,8 +306,8 @@ CFUrlRequestUnittestRunner::CFUrlRequestUnittestRunner(int argc, char** argv)
       registrar_(chrome_frame_test::GetTestBedType()),
       test_result_(0) {
   // Register the main thread by instantiating it, but don't call any methods.
-  main_thread_.reset(new DeprecatedBrowserThread(BrowserThread::UI,
-                                                 MessageLoop::current()));
+  main_thread_.reset(new content::DeprecatedBrowserThread(
+      BrowserThread::UI, MessageLoop::current()));
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   fake_chrome_.Initialize();
   pss_subclass_.reset(new ProcessSingletonSubclass(this));
diff --git a/chrome_frame/test/net/fake_external_tab.h b/chrome_frame/test/net/fake_external_tab.h
index ea72a7b..756e8f8 100644
--- a/chrome_frame/test/net/fake_external_tab.h
+++ b/chrome_frame/test/net/fake_external_tab.h
@@ -105,7 +105,7 @@ class CFUrlRequestUnittestRunner
   // on the main thread.
   FakeExternalTab fake_chrome_;
   scoped_ptr<ProcessSingletonSubclass> pss_subclass_;
-  scoped_ptr<DeprecatedBrowserThread> main_thread_;
+  scoped_ptr<content::DeprecatedBrowserThread> main_thread_;
   ScopedChromeFrameRegistrar registrar_;
   int test_result_;
 };
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;
diff --git a/content/public/browser/browser_thread.h b/content/public/browser/browser_thread.h
index 364f05d..001a166 100644
--- a/content/public/browser/browser_thread.h
+++ b/content/public/browser/browser_thread.h
@@ -21,9 +21,8 @@ class MessageLoopProxy;
 }
 
 namespace content {
-class BrowserThreadImpl;
-}
 
+class BrowserThreadImpl;
 class DeprecatedBrowserThread;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -250,4 +249,10 @@ class CONTENT_EXPORT DeprecatedBrowserThread : public BrowserThread {
   virtual ~DeprecatedBrowserThread();
 };
 
+}  // namespace content
+
+// TODO(joi): Remove these ASAP.
+using content::BrowserThread;
+using content::DeprecatedBrowserThread;
+
 #endif  // CONTENT_PUBLIC_BROWSER_BROWSER_THREAD_H_
diff --git a/content/shell/shell_browser_context.cc b/content/shell/shell_browser_context.cc
index 78bef35..f45bbb6 100644
--- a/content/shell/shell_browser_context.cc
+++ b/content/shell/shell_browser_context.cc
@@ -30,6 +30,8 @@
 #include "base/base_paths_win.h"
 #endif
 
+using content::BrowserThread;
+
 namespace {
 
 class ShellGeolocationPermissionContext : public GeolocationPermissionContext {
diff --git a/tools/valgrind/tsan/suppressions.txt b/tools/valgrind/tsan/suppressions.txt
index 66ded48..a74fcec 100644
--- a/tools/valgrind/tsan/suppressions.txt
+++ b/tools/valgrind/tsan/suppressions.txt
@@ -494,7 +494,7 @@
   bug_89141
   ThreadSanitizer:Race
   fun:base::Thread::message_loop
-  fun:BrowserThread::IsMessageLoopValid
+  fun:content::BrowserThread::IsMessageLoopValid
   fun:ThreadWatcherList::StartWatching
   fun:ThreadWatcherList::InitializeAndStartWatching
 }
@@ -601,8 +601,8 @@
 {
   bug_102134b
   ThreadSanitizer:Race
-  fun:BrowserThread::~BrowserThread
-  fun:DeprecatedBrowserThread::~DeprecatedBrowserThread
+  fun:content::BrowserThread::~BrowserThread
+  fun:content::DeprecatedBrowserThread::~DeprecatedBrowserThread
 }
 {
   bug_102327_a