summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/app_notification_manager.cc2
-rw-r--r--chrome/browser/extensions/app_notification_manager_sync_unittest.cc2
-rw-r--r--chrome/browser/extensions/app_notification_manager_unittest.cc2
-rw-r--r--chrome/browser/extensions/app_notification_storage.cc1
-rw-r--r--chrome/browser/extensions/app_notification_storage_unittest.cc2
-rw-r--r--chrome/browser/extensions/app_notify_channel_setup.cc2
-rw-r--r--chrome/browser/extensions/app_notify_channel_setup_unittest.cc2
-rw-r--r--chrome/browser/extensions/autoupdate_interceptor.cc2
-rw-r--r--chrome/browser/extensions/crx_installer.cc2
-rw-r--r--chrome/browser/extensions/execute_code_in_tab_function.cc2
-rw-r--r--chrome/browser/extensions/extension_clear_api.cc2
-rw-r--r--chrome/browser/extensions/extension_content_settings_api.cc2
-rw-r--r--chrome/browser/extensions/extension_content_settings_store.cc1
-rw-r--r--chrome/browser/extensions/extension_cookies_api.cc2
-rw-r--r--chrome/browser/extensions/extension_data_deleter.cc2
-rw-r--r--chrome/browser/extensions/extension_data_deleter.h7
-rw-r--r--chrome/browser/extensions/extension_downloads_api.cc2
-rw-r--r--chrome/browser/extensions/extension_event_router.cc2
-rw-r--r--chrome/browser/extensions/extension_event_router_forwarder.cc2
-rw-r--r--chrome/browser/extensions/extension_event_router_forwarder_unittest.cc2
-rw-r--r--chrome/browser/extensions/extension_file_browser_private_api.cc2
-rw-r--r--chrome/browser/extensions/extension_function.cc2
-rw-r--r--chrome/browser/extensions/extension_function.h6
-rw-r--r--chrome/browser/extensions/extension_icon_manager_unittest.cc2
-rw-r--r--chrome/browser/extensions/extension_info_map.cc2
-rw-r--r--chrome/browser/extensions/extension_info_map_unittest.cc2
-rw-r--r--chrome/browser/extensions/extension_management_api.cc1
-rw-r--r--chrome/browser/extensions/extension_menu_manager_unittest.cc1
-rw-r--r--chrome/browser/extensions/extension_prefs_unittest.cc1
-rw-r--r--chrome/browser/extensions/extension_process_manager.cc2
-rw-r--r--chrome/browser/extensions/extension_save_page_api.cc2
-rw-r--r--chrome/browser/extensions/extension_service.cc1
-rw-r--r--chrome/browser/extensions/extension_service_unittest.cc2
-rw-r--r--chrome/browser/extensions/extension_settings_api.cc2
-rw-r--r--chrome/browser/extensions/extension_settings_backend.cc2
-rw-r--r--chrome/browser/extensions/extension_settings_frontend.cc2
-rw-r--r--chrome/browser/extensions/extension_settings_frontend_unittest.cc2
-rw-r--r--chrome/browser/extensions/extension_settings_leveldb_storage.cc2
-rw-r--r--chrome/browser/extensions/extension_settings_storage_unittest.cc2
-rw-r--r--chrome/browser/extensions/extension_settings_sync_unittest.cc2
-rw-r--r--chrome/browser/extensions/extension_special_storage_policy.cc2
-rw-r--r--chrome/browser/extensions/extension_special_storage_policy_unittest.cc2
-rw-r--r--chrome/browser/extensions/extension_tab_id_map.cc2
-rw-r--r--chrome/browser/extensions/extension_updater.cc1
-rw-r--r--chrome/browser/extensions/extension_updater_unittest.cc1
-rw-r--r--chrome/browser/extensions/extension_warning_set.cc2
-rw-r--r--chrome/browser/extensions/extension_webrequest_api.cc2
-rw-r--r--chrome/browser/extensions/extension_webrequest_time_tracker.cc2
-rw-r--r--chrome/browser/extensions/extensions_quota_service_unittest.cc1
-rw-r--r--chrome/browser/extensions/external_extension_loader.cc2
-rw-r--r--chrome/browser/extensions/external_extension_provider_impl.cc2
-rw-r--r--chrome/browser/extensions/external_policy_extension_loader_unittest.cc2
-rw-r--r--chrome/browser/extensions/external_pref_extension_loader.cc2
-rw-r--r--chrome/browser/extensions/external_registry_extension_loader_win.cc2
-rw-r--r--chrome/browser/extensions/file_manager_util.cc2
-rw-r--r--chrome/browser/extensions/file_reader.cc2
-rw-r--r--chrome/browser/extensions/file_reader_unittest.cc2
-rw-r--r--chrome/browser/extensions/image_loading_tracker.cc2
-rw-r--r--chrome/browser/extensions/image_loading_tracker_unittest.cc2
-rw-r--r--chrome/browser/extensions/key_identifier_conversion_views.cc2
-rw-r--r--chrome/browser/extensions/key_identifier_conversion_views_unittest.cc2
-rw-r--r--chrome/browser/extensions/network_delay_listener.cc2
-rw-r--r--chrome/browser/extensions/pack_extension_job.cc2
-rw-r--r--chrome/browser/extensions/pack_extension_job.h2
-rw-r--r--chrome/browser/extensions/pending_extension_manager.cc2
-rw-r--r--chrome/browser/extensions/sandboxed_extension_unpacker.cc2
-rw-r--r--chrome/browser/extensions/sandboxed_extension_unpacker.h2
-rw-r--r--chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc1
-rw-r--r--chrome/browser/extensions/speech_input/extension_speech_input_apitest.cc2
-rw-r--r--chrome/browser/extensions/speech_input/extension_speech_input_manager.cc2
-rw-r--r--chrome/browser/extensions/syncable_extension_settings_storage.cc2
-rw-r--r--chrome/browser/extensions/test_extension_prefs.cc2
-rw-r--r--chrome/browser/extensions/user_script_listener.cc2
-rw-r--r--chrome/browser/extensions/user_script_master.cc2
-rw-r--r--chrome/browser/extensions/user_script_master.h2
-rw-r--r--chrome/browser/extensions/user_script_master_unittest.cc2
-rw-r--r--chrome/browser/extensions/webstore_inline_installer.cc2
-rw-r--r--chrome/browser/extensions/webstore_install_helper.cc2
78 files changed, 147 insertions, 8 deletions
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";