diff options
Diffstat (limited to 'chrome/browser/chromeos')
76 files changed, 141 insertions, 7 deletions
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[] = { |