diff options
| author | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 17:24:36 +0000 |
|---|---|---|
| committer | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 17:24:36 +0000 |
| commit | 22e548845b1548ebad28c9d68ad075bce949ec57 (patch) | |
| tree | 961dbf84bc94107f4276823d5dff6a23af372d5a | |
| parent | 71e40eef96ef707986c118937d9579fa0b768e13 (diff) | |
| download | chromium_src-22e548845b1548ebad28c9d68ad075bce949ec57.zip chromium_src-22e548845b1548ebad28c9d68ad075bce949ec57.tar.gz chromium_src-22e548845b1548ebad28c9d68ad075bce949ec57.tar.bz2 | |
Componentize (Mutable)ProfileOAuth2TokenService.
This CL componentizes the following:
- ProfileOAuth2TokenService (obsolete references to Profile removed)
- MutableProfileOAuth2TokenService (no changes required)
- SigninErrorController (no changes required)
BUG=334156,333993,334217
TBR=jochen
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=258039
Review URL: https://codereview.chromium.org/201163002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258317 0039d316-1c4b-4281-b951-d872f2087c98
96 files changed, 142 insertions, 145 deletions
diff --git a/chrome/browser/android/signin/signin_manager_android.cc b/chrome/browser/android/signin/signin_manager_android.cc index 3c0c02f..f96de01 100644 --- a/chrome/browser/android/signin/signin_manager_android.cc +++ b/chrome/browser/android/signin/signin_manager_android.cc @@ -18,12 +18,12 @@ #include "chrome/browser/browsing_data/browsing_data_remover.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/signin/android_profile_oauth2_token_service.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/common/pref_names.h" #include "chrome/common/profile_management_switches.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "jni/SigninManager_jni.h" #if defined(ENABLE_CONFIGURATION_POLICY) diff --git a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc index 3f61108..8318b37c 100644 --- a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc +++ b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc @@ -19,7 +19,6 @@ #include "chrome/browser/extensions/updater/extension_updater.h" #include "chrome/browser/extensions/webstore_startup_installer.h" #include "chrome/browser/lifetime/application_lifetime.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -28,6 +27,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/extensions/manifest_url_handler.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "extensions/browser/extension_system.h" diff --git a/chrome/browser/chromeos/drive/drive_integration_service.cc b/chrome/browser/chromeos/drive/drive_integration_service.cc index f21dfd7..15f20c0 100644 --- a/chrome/browser/chromeos/drive/drive_integration_service.cc +++ b/chrome/browser/chromeos/drive/drive_integration_service.cc @@ -31,13 +31,13 @@ #include "chrome/browser/drive/drive_notification_manager_factory.h" #include "chrome/browser/drive/event_logger.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/user_agent.h" diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc index 9c3c543..b3bca91 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc @@ -23,7 +23,6 @@ #include "chrome/browser/profiles/profile_info_util.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profiles_state.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -31,6 +30,7 @@ #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" #include "chrome/common/extensions/api/file_browser_private.h" #include "chrome/common/pref_names.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/page_zoom.h" diff --git a/chrome/browser/chromeos/login/oauth2_browsertest.cc b/chrome/browser/chromeos/login/oauth2_browsertest.cc index d1fa7be..574d672 100644 --- a/chrome/browser/chromeos/login/oauth2_browsertest.cc +++ b/chrome/browser/chromeos/login/oauth2_browsertest.cc @@ -15,7 +15,6 @@ #include "chrome/browser/chromeos/login/wizard_controller.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h" #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" @@ -25,6 +24,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" #include "chrome/test/base/ui_test_utils.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/notification_service.h" #include "content/public/test/browser_test_utils.h" #include "extensions/browser/process_manager.h" diff --git a/chrome/browser/chromeos/login/oauth2_login_manager.cc b/chrome/browser/chromeos/login/oauth2_login_manager.cc index 07f841f..fd614a3 100644 --- a/chrome/browser/chromeos/login/oauth2_login_manager.cc +++ b/chrome/browser/chromeos/login/oauth2_login_manager.cc @@ -14,12 +14,12 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/common/chrome_switches.h" #include "chromeos/chromeos_switches.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "google_apis/gaia/gaia_auth_util.h" #include "google_apis/gaia/gaia_constants.h" #include "google_apis/gaia/gaia_urls.h" diff --git a/chrome/browser/chromeos/login/oauth2_login_verifier.cc b/chrome/browser/chromeos/login/oauth2_login_verifier.cc index 69178c8..fa0cf0a 100644 --- a/chrome/browser/chromeos/login/oauth2_login_verifier.cc +++ b/chrome/browser/chromeos/login/oauth2_login_verifier.cc @@ -12,13 +12,13 @@ #include "base/strings/stringprintf.h" #include "base/time/time.h" #include "chrome/browser/chromeos/net/network_portal_detector.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chromeos/network/network_handler.h" #include "chromeos/network/network_state.h" #include "chromeos/network/network_state_handler.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/browser_thread.h" #include "google_apis/gaia/gaia_constants.h" #include "third_party/cros_system_api/dbus/service_constants.h" diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc index eefaf60..8885d3f 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc +++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc @@ -21,7 +21,6 @@ #include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/browser/signin/fake_profile_oauth2_token_service.h" #include "chrome/browser/signin/fake_profile_oauth2_token_service_wrapper.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -36,6 +35,7 @@ #include "components/policy/core/common/external_data_fetcher.h" #include "components/policy/core/common/mock_configuration_policy_provider.h" #include "components/policy/core/common/schema_registry.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/gaia/gaia_auth_consumer.h" #include "google_apis/gaia/gaia_constants.h" diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.cc b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.cc index 08f4721..3d91613 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.cc +++ b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.cc @@ -6,9 +6,9 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/signin_manager.h" #include "components/policy/core/common/cloud/cloud_policy_core.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/notification_source.h" #include "google_apis/gaia/gaia_constants.h" diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.cc b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.cc index 29750e5..ef1abff 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.cc +++ b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.cc @@ -8,11 +8,11 @@ #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h" #include "chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" +#include "components/signin/core/profile_oauth2_token_service.h" namespace policy { diff --git a/chrome/browser/extensions/api/identity/account_tracker.cc b/chrome/browser/extensions/api/identity/account_tracker.cc index f238316..9d7b43f 100644 --- a/chrome/browser/extensions/api/identity/account_tracker.cc +++ b/chrome/browser/extensions/api/identity/account_tracker.cc @@ -9,10 +9,10 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/notification_details.h" #include "extensions/browser/extension_system.h" diff --git a/chrome/browser/extensions/api/identity/account_tracker.h b/chrome/browser/extensions/api/identity/account_tracker.h index 16d8b95..cbf0055 100644 --- a/chrome/browser/extensions/api/identity/account_tracker.h +++ b/chrome/browser/extensions/api/identity/account_tracker.h @@ -9,8 +9,8 @@ #include <string> #include "base/observer_list.h" -#include "chrome/browser/signin/signin_error_controller.h" #include "chrome/browser/signin/signin_manager_base.h" +#include "components/signin/core/signin_error_controller.h" #include "google_apis/gaia/gaia_oauth_client.h" #include "google_apis/gaia/oauth2_token_service.h" diff --git a/chrome/browser/extensions/api/identity/gaia_web_auth_flow.cc b/chrome/browser/extensions/api/identity/gaia_web_auth_flow.cc index 36c78b4..6899159 100644 --- a/chrome/browser/extensions/api/identity/gaia_web_auth_flow.cc +++ b/chrome/browser/extensions/api/identity/gaia_web_auth_flow.cc @@ -9,10 +9,10 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "google_apis/gaia/gaia_urls.h" #include "net/base/escape.h" diff --git a/chrome/browser/extensions/api/identity/identity_api.cc b/chrome/browser/extensions/api/identity/identity_api.cc index 66988f5..7881576 100644 --- a/chrome/browser/extensions/api/identity/identity_api.cc +++ b/chrome/browser/extensions/api/identity/identity_api.cc @@ -19,7 +19,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_global_error.h" #include "chrome/browser/signin/signin_manager.h" @@ -28,6 +27,7 @@ #include "chrome/common/extensions/api/identity/oauth2_manifest_handler.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "extensions/browser/event_router.h" #include "extensions/browser/extension_function_dispatcher.h" #include "extensions/browser/extension_system.h" diff --git a/chrome/browser/extensions/api/identity/identity_signin_flow.cc b/chrome/browser/extensions/api/identity/identity_signin_flow.cc index 65fd649..380f45a 100644 --- a/chrome/browser/extensions/api/identity/identity_signin_flow.cc +++ b/chrome/browser/extensions/api/identity/identity_signin_flow.cc @@ -5,12 +5,12 @@ #include "chrome/browser/extensions/api/identity/identity_signin_flow.h" #include "chrome/browser/app_mode/app_mode_utils.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/ui/webui/signin/login_ui_service.h" #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" +#include "components/signin/core/profile_oauth2_token_service.h" namespace extensions { diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc index 1ba50c8..bae2028 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc @@ -19,12 +19,12 @@ #include "chrome/browser/invalidation/invalidation_service.h" #include "chrome/browser/invalidation/invalidation_service_factory.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" #include "chrome/common/extensions/api/push_messaging.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc index 983b3bb..433c173 100644 --- a/chrome/browser/extensions/extension_install_prompt.cc +++ b/chrome/browser/extensions/extension_install_prompt.cc @@ -17,7 +17,6 @@ #include "chrome/browser/extensions/extension_install_ui.h" #include "chrome/browser/extensions/image_loader.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" @@ -27,6 +26,7 @@ #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/pref_names.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/history/web_history_service.cc b/chrome/browser/history/web_history_service.cc index a8be69c..4573135 100644 --- a/chrome/browser/history/web_history_service.cc +++ b/chrome/browser/history/web_history_service.cc @@ -12,10 +12,10 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "google_apis/gaia/gaia_urls.h" #include "google_apis/gaia/google_service_auth_error.h" #include "google_apis/gaia/oauth2_token_service.h" diff --git a/chrome/browser/invalidation/gcm_invalidation_bridge.cc b/chrome/browser/invalidation/gcm_invalidation_bridge.cc index d9a7e51..1f63a28 100644 --- a/chrome/browser/invalidation/gcm_invalidation_bridge.cc +++ b/chrome/browser/invalidation/gcm_invalidation_bridge.cc @@ -9,10 +9,10 @@ #include "chrome/browser/invalidation/gcm_invalidation_bridge.h" #include "chrome/browser/services/gcm/gcm_profile_service.h" #include "chrome/browser/services/gcm/gcm_profile_service_factory.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "google_apis/gaia/gaia_constants.h" namespace invalidation { diff --git a/chrome/browser/invalidation/gcm_invalidation_bridge_unittest.cc b/chrome/browser/invalidation/gcm_invalidation_bridge_unittest.cc index 307d0c6..76f7926 100644 --- a/chrome/browser/invalidation/gcm_invalidation_bridge_unittest.cc +++ b/chrome/browser/invalidation/gcm_invalidation_bridge_unittest.cc @@ -8,9 +8,9 @@ #include "chrome/browser/services/gcm/gcm_profile_service_factory.h" #include "chrome/browser/signin/fake_profile_oauth2_token_service.h" #include "chrome/browser/signin/fake_profile_oauth2_token_service_wrapper.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/test/base/testing_profile.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/gaia/google_service_auth_error.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/invalidation/invalidation_service_factory.cc b/chrome/browser/invalidation/invalidation_service_factory.cc index 26989d1..8992429 100644 --- a/chrome/browser/invalidation/invalidation_service_factory.cc +++ b/chrome/browser/invalidation/invalidation_service_factory.cc @@ -12,11 +12,11 @@ #include "chrome/browser/invalidation/ticl_invalidation_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/services/gcm/gcm_profile_service_factory.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" +#include "components/signin/core/profile_oauth2_token_service.h" #if defined(OS_ANDROID) #include "chrome/browser/invalidation/invalidation_controller_android.h" diff --git a/chrome/browser/invalidation/ticl_invalidation_service.cc b/chrome/browser/invalidation/ticl_invalidation_service.cc index 25c8f3d..cc9d022 100644 --- a/chrome/browser/invalidation/ticl_invalidation_service.cc +++ b/chrome/browser/invalidation/ticl_invalidation_service.cc @@ -12,9 +12,9 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/about_signin_internals.h" #include "chrome/browser/signin/about_signin_internals_factory.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/common/chrome_content_client.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "google_apis/gaia/gaia_constants.h" #include "sync/notifier/gcm_network_channel_delegate.h" #include "sync/notifier/invalidation_util.h" diff --git a/chrome/browser/invalidation/ticl_invalidation_service.h b/chrome/browser/invalidation/ticl_invalidation_service.h index 860116a..beb9768 100644 --- a/chrome/browser/invalidation/ticl_invalidation_service.h +++ b/chrome/browser/invalidation/ticl_invalidation_service.h @@ -11,9 +11,9 @@ #include "chrome/browser/invalidation/invalidation_logger.h" #include "chrome/browser/invalidation/invalidation_service.h" #include "chrome/browser/invalidation/invalidator_storage.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/signin_manager.h" #include "components/keyed_service/core/keyed_service.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "google_apis/gaia/oauth2_token_service.h" #include "net/base/backoff_entry.h" #include "sync/notifier/invalidation_handler.h" diff --git a/chrome/browser/managed_mode/managed_user_registration_utility.cc b/chrome/browser/managed_mode/managed_user_registration_utility.cc index a080268..ff636e9 100644 --- a/chrome/browser/managed_mode/managed_user_registration_utility.cc +++ b/chrome/browser/managed_mode/managed_user_registration_utility.cc @@ -19,13 +19,13 @@ #include "chrome/browser/managed_mode/managed_user_sync_service.h" #include "chrome/browser/managed_mode/managed_user_sync_service_factory.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/sync/glue/device_info.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "google_apis/gaia/gaia_urls.h" #include "google_apis/gaia/google_service_auth_error.h" diff --git a/chrome/browser/managed_mode/managed_user_service.cc b/chrome/browser/managed_mode/managed_user_service.cc index 1eb90aa..6cdbd76 100644 --- a/chrome/browser/managed_mode/managed_user_service.cc +++ b/chrome/browser/managed_mode/managed_user_service.cc @@ -28,7 +28,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_base.h" @@ -40,6 +39,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/api/managed_mode_private/managed_mode_handler.h" #include "chrome/common/pref_names.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/policy/cloud/user_policy_signin_service.cc b/chrome/browser/policy/cloud/user_policy_signin_service.cc index cb5a710..dd2baa1 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service.cc +++ b/chrome/browser/policy/cloud/user_policy_signin_service.cc @@ -11,11 +11,11 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "components/policy/core/common/cloud/cloud_policy_client_registration_helper.h" #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "google_apis/gaia/gaia_constants.h" diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_android.cc b/chrome/browser/policy/cloud/user_policy_signin_service_android.cc index 3768e0f..f7d27bd 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service_android.cc +++ b/chrome/browser/policy/cloud/user_policy_signin_service_android.cc @@ -13,13 +13,13 @@ #include "base/prefs/pref_service.h" #include "base/time/time.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/common/pref_names.h" #include "components/policy/core/common/cloud/cloud_policy_client_registration_helper.h" #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #include "components/policy/core/common/policy_switches.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "net/base/network_change_notifier.h" #include "net/url_request/url_request_context_getter.h" #include "policy/proto/device_management_backend.pb.h" diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_ios.mm b/chrome/browser/policy/cloud/user_policy_signin_service_ios.mm index b3da67c..b5f7baa 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service_ios.mm +++ b/chrome/browser/policy/cloud/user_policy_signin_service_ios.mm @@ -13,13 +13,13 @@ #include "base/prefs/pref_service.h" #include "base/time/time.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/common/pref_names.h" #include "components/policy/core/common/cloud/cloud_policy_client_registration_helper.h" #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #include "components/policy/core/common/policy_switches.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "net/base/network_change_notifier.h" #include "net/url_request/url_request_context_getter.h" #include "policy/proto/device_management_backend.pb.h" diff --git a/chrome/browser/profiles/profile_downloader.cc b/chrome/browser/profiles/profile_downloader.cc index 7248e53..deb3b01 100644 --- a/chrome/browser/profiles/profile_downloader.cc +++ b/chrome/browser/profiles/profile_downloader.cc @@ -17,10 +17,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_downloader_delegate.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/browser_thread.h" #include "google_apis/gaia/gaia_constants.h" #include "google_apis/gaia/gaia_urls.h" diff --git a/chrome/browser/profiles/profiles_state.cc b/chrome/browser/profiles/profiles_state.cc index 3c8aa1b..3eee013 100644 --- a/chrome/browser/profiles/profiles_state.cc +++ b/chrome/browser/profiles/profiles_state.cc @@ -12,11 +12,11 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/pref_names.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/services/gcm/gcm_profile_service.cc b/chrome/browser/services/gcm/gcm_profile_service.cc index 5927683..2f8fcc0 100644 --- a/chrome/browser/services/gcm/gcm_profile_service.cc +++ b/chrome/browser/services/gcm/gcm_profile_service.cc @@ -19,7 +19,6 @@ #include "chrome/browser/extensions/state_store.h" #include "chrome/browser/services/gcm/gcm_app_handler.h" #include "chrome/browser/services/gcm/gcm_client_factory.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -27,6 +26,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/signin/about_signin_internals.cc b/chrome/browser/signin/about_signin_internals.cc index 825a5eb..838bba1 100644 --- a/chrome/browser/signin/about_signin_internals.cc +++ b/chrome/browser/signin/about_signin_internals.cc @@ -12,11 +12,11 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_internals_util.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/common/chrome_version_info.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "google_apis/gaia/gaia_constants.h" using base::Time; diff --git a/chrome/browser/signin/account_reconcilor.cc b/chrome/browser/signin/account_reconcilor.cc index 3d800a6..e36c5a9 100644 --- a/chrome/browser/signin/account_reconcilor.cc +++ b/chrome/browser/signin/account_reconcilor.cc @@ -16,10 +16,10 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/net/chrome_cookie_notification_details.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/signin/signin_oauth_helper.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "google_apis/gaia/gaia_auth_fetcher.h" diff --git a/chrome/browser/signin/account_reconcilor_unittest.cc b/chrome/browser/signin/account_reconcilor_unittest.cc index 01fab42..c524ef4 100644 --- a/chrome/browser/signin/account_reconcilor_unittest.cc +++ b/chrome/browser/signin/account_reconcilor_unittest.cc @@ -10,11 +10,11 @@ #include "chrome/browser/signin/fake_profile_oauth2_token_service.h" #include "chrome/browser/signin/fake_profile_oauth2_token_service_wrapper.h" #include "chrome/browser/signin/fake_signin_manager.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/test/base/testing_profile.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/gaia/gaia_urls.h" #include "net/url_request/test_url_fetcher_factory.h" diff --git a/chrome/browser/signin/android_profile_oauth2_token_service.h b/chrome/browser/signin/android_profile_oauth2_token_service.h index 78d526a..98b0533 100644 --- a/chrome/browser/signin/android_profile_oauth2_token_service.h +++ b/chrome/browser/signin/android_profile_oauth2_token_service.h @@ -12,7 +12,7 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "google_apis/gaia/google_service_auth_error.h" // A specialization of ProfileOAuth2TokenService that will be returned by diff --git a/chrome/browser/signin/fake_auth_status_provider.h b/chrome/browser/signin/fake_auth_status_provider.h index e5969f6..3552788 100644 --- a/chrome/browser/signin/fake_auth_status_provider.h +++ b/chrome/browser/signin/fake_auth_status_provider.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SIGNIN_FAKE_AUTH_STATUS_PROVIDER_H_ #define CHROME_BROWSER_SIGNIN_FAKE_AUTH_STATUS_PROVIDER_H_ -#include "chrome/browser/signin/signin_error_controller.h" +#include "components/signin/core/signin_error_controller.h" // Helper class that reports auth errors to SigninErrorController. Automatically // registers and de-registers itself as an AuthStatusProvider in the diff --git a/chrome/browser/signin/fake_profile_oauth2_token_service.h b/chrome/browser/signin/fake_profile_oauth2_token_service.h index f6a386f..93933e5 100644 --- a/chrome/browser/signin/fake_profile_oauth2_token_service.h +++ b/chrome/browser/signin/fake_profile_oauth2_token_service.h @@ -14,7 +14,7 @@ #if defined(OS_ANDROID) #include "chrome/browser/signin/android_profile_oauth2_token_service.h" #else -#include "chrome/browser/signin/profile_oauth2_token_service.h" +#include "components/signin/core/profile_oauth2_token_service.h" #endif // Helper class to simplify writing unittests that depend on an instance of diff --git a/chrome/browser/signin/fake_profile_oauth2_token_service_wrapper.cc b/chrome/browser/signin/fake_profile_oauth2_token_service_wrapper.cc index 5484c20..500d207 100644 --- a/chrome/browser/signin/fake_profile_oauth2_token_service_wrapper.cc +++ b/chrome/browser/signin/fake_profile_oauth2_token_service_wrapper.cc @@ -27,8 +27,7 @@ FakeProfileOAuth2TokenServiceWrapper::FakeProfileOAuth2TokenServiceWrapper( if (auto_issue_tokens) service_.set_auto_post_fetch_response_on_message_loop(true); service_.Initialize( - ChromeSigninClientFactory::GetInstance()->GetForProfile(profile), - reinterpret_cast<Profile*>(profile)); + ChromeSigninClientFactory::GetInstance()->GetForProfile(profile)); } FakeProfileOAuth2TokenServiceWrapper::~FakeProfileOAuth2TokenServiceWrapper() { diff --git a/chrome/browser/signin/mutable_profile_oauth2_token_service_unittest.cc b/chrome/browser/signin/mutable_profile_oauth2_token_service_unittest.cc index 18fbc51..e277f4c 100644 --- a/chrome/browser/signin/mutable_profile_oauth2_token_service_unittest.cc +++ b/chrome/browser/signin/mutable_profile_oauth2_token_service_unittest.cc @@ -3,12 +3,12 @@ // found in the LICENSE file. #include "base/run_loop.h" -#include "chrome/browser/signin/mutable_profile_oauth2_token_service.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" -#include "chrome/browser/signin/signin_error_controller.h" #include "chrome/browser/webdata/web_data_service_factory.h" #include "chrome/test/base/testing_profile.h" +#include "components/signin/core/mutable_profile_oauth2_token_service.h" +#include "components/signin/core/profile_oauth2_token_service.h" +#include "components/signin/core/signin_error_controller.h" #include "components/signin/core/webdata/token_web_data.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/gaia/gaia_constants.h" diff --git a/chrome/browser/signin/profile_oauth2_token_service_factory.cc b/chrome/browser/signin/profile_oauth2_token_service_factory.cc index be35495..a7cb8bf 100644 --- a/chrome/browser/signin/profile_oauth2_token_service_factory.cc +++ b/chrome/browser/signin/profile_oauth2_token_service_factory.cc @@ -6,15 +6,15 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/chrome_signin_client_factory.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/ui/global_error/global_error_service_factory.h" #include "chrome/browser/webdata/web_data_service_factory.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" +#include "components/signin/core/profile_oauth2_token_service.h" #if defined(OS_ANDROID) #include "chrome/browser/signin/android_profile_oauth2_token_service.h" #else -#include "chrome/browser/signin/mutable_profile_oauth2_token_service.h" +#include "components/signin/core/mutable_profile_oauth2_token_service.h" #endif class ProfileOAuth2TokenServiceWrapperImpl @@ -39,7 +39,7 @@ ProfileOAuth2TokenServiceWrapperImpl::ProfileOAuth2TokenServiceWrapperImpl( PlatformSpecificOAuth2TokenService()); ChromeSigninClient* client = ChromeSigninClientFactory::GetInstance()->GetForProfile(profile); - profile_oauth2_token_service_->Initialize(client, profile); + profile_oauth2_token_service_->Initialize(client); } ProfileOAuth2TokenServiceWrapperImpl::~ProfileOAuth2TokenServiceWrapperImpl() {} diff --git a/chrome/browser/signin/profile_oauth2_token_service_request.cc b/chrome/browser/signin/profile_oauth2_token_service_request.cc index bde1ea1..3e9ae24 100644 --- a/chrome/browser/signin/profile_oauth2_token_service_request.cc +++ b/chrome/browser/signin/profile_oauth2_token_service_request.cc @@ -10,10 +10,10 @@ #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/browser_thread.h" #include "google_apis/gaia/google_service_auth_error.h" #include "google_apis/gaia/oauth2_access_token_consumer.h" diff --git a/chrome/browser/signin/signin_account_id_helper.cc b/chrome/browser/signin/signin_account_id_helper.cc index 6a91339..44b03fe 100644 --- a/chrome/browser/signin/signin_account_id_helper.cc +++ b/chrome/browser/signin/signin_account_id_helper.cc @@ -6,9 +6,9 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/common/pref_names.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "google_apis/gaia/gaia_oauth_client.h" // TODO(guohui): this class should be moved to a more generic place for reuse. diff --git a/chrome/browser/signin/signin_error_controller_unittest.cc b/chrome/browser/signin/signin_error_controller_unittest.cc index 6eb0c1b..f2146d2 100644 --- a/chrome/browser/signin/signin_error_controller_unittest.cc +++ b/chrome/browser/signin/signin_error_controller_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/signin/signin_error_controller.h" +#include "components/signin/core/signin_error_controller.h" #include <functional> diff --git a/chrome/browser/signin/signin_error_notifier_ash.h b/chrome/browser/signin/signin_error_notifier_ash.h index a8d09f1..34819b3 100644 --- a/chrome/browser/signin/signin_error_notifier_ash.h +++ b/chrome/browser/signin/signin_error_notifier_ash.h @@ -10,8 +10,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/strings/string16.h" -#include "chrome/browser/signin/signin_error_controller.h" #include "components/keyed_service/core/keyed_service.h" +#include "components/signin/core/signin_error_controller.h" class Profile; diff --git a/chrome/browser/signin/signin_error_notifier_ash_unittest.cc b/chrome/browser/signin/signin_error_notifier_ash_unittest.cc index 3161f17..4bc4400 100644 --- a/chrome/browser/signin/signin_error_notifier_ash_unittest.cc +++ b/chrome/browser/signin/signin_error_notifier_ash_unittest.cc @@ -11,9 +11,7 @@ #include "chrome/browser/notifications/notification_ui_manager.h" #include "chrome/browser/signin/fake_auth_status_provider.h" #include "chrome/browser/signin/fake_signin_manager.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" -#include "chrome/browser/signin/signin_error_controller.h" #include "chrome/browser/signin/signin_error_notifier_factory_ash.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -21,6 +19,8 @@ #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" +#include "components/signin/core/profile_oauth2_token_service.h" +#include "components/signin/core/signin_error_controller.h" #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/message_center/notification.h" diff --git a/chrome/browser/signin/signin_error_notifier_factory_ash.cc b/chrome/browser/signin/signin_error_notifier_factory_ash.cc index d4004dd..1c621d8 100644 --- a/chrome/browser/signin/signin_error_notifier_factory_ash.cc +++ b/chrome/browser/signin/signin_error_notifier_factory_ash.cc @@ -7,10 +7,10 @@ #include "ash/shell.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_error_notifier_ash.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" +#include "components/signin/core/profile_oauth2_token_service.h" SigninErrorNotifierFactory::SigninErrorNotifierFactory() : BrowserContextKeyedServiceFactory( diff --git a/chrome/browser/signin/signin_global_error.h b/chrome/browser/signin/signin_global_error.h index ab71b8b..7723c83 100644 --- a/chrome/browser/signin/signin_global_error.h +++ b/chrome/browser/signin/signin_global_error.h @@ -8,9 +8,9 @@ #include <set> #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "chrome/browser/signin/signin_error_controller.h" #include "chrome/browser/ui/global_error/global_error.h" #include "components/keyed_service/core/keyed_service.h" +#include "components/signin/core/signin_error_controller.h" class Profile; diff --git a/chrome/browser/signin/signin_global_error_factory.cc b/chrome/browser/signin/signin_global_error_factory.cc index 2396937..6dc46d0 100644 --- a/chrome/browser/signin/signin_global_error_factory.cc +++ b/chrome/browser/signin/signin_global_error_factory.cc @@ -6,11 +6,11 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_global_error.h" #include "chrome/browser/ui/global_error/global_error_service_factory.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" +#include "components/signin/core/profile_oauth2_token_service.h" #if defined(USE_ASH) #include "ash/shell.h" diff --git a/chrome/browser/signin/signin_global_error_unittest.cc b/chrome/browser/signin/signin_global_error_unittest.cc index 9284e68..62e8863 100644 --- a/chrome/browser/signin/signin_global_error_unittest.cc +++ b/chrome/browser/signin/signin_global_error_unittest.cc @@ -11,7 +11,6 @@ #include "chrome/browser/signin/fake_profile_oauth2_token_service_wrapper.h" #include "chrome/browser/signin/fake_signin_manager.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" -#include "chrome/browser/signin/signin_error_controller.h" #include "chrome/browser/signin/signin_global_error_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -19,6 +18,7 @@ #include "chrome/browser/ui/global_error/global_error_service_factory.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" +#include "components/signin/core/signin_error_controller.h" #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/signin/signin_manager.cc b/chrome/browser/signin/signin_manager.cc index de30bfc..6d09ce3 100644 --- a/chrome/browser/signin/signin_manager.cc +++ b/chrome/browser/signin/signin_manager.cc @@ -17,13 +17,13 @@ #include "chrome/browser/signin/about_signin_internals.h" #include "chrome/browser/signin/about_signin_internals_factory.h" #include "chrome/browser/signin/local_auth.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_account_id_helper.h" #include "chrome/browser/signin/signin_internals_util.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/common/pref_names.h" #include "chrome/common/profile_management_switches.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "components/signin/core/signin_client.h" #include "components/signin/core/signin_manager_cookie_helper.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/signin/signin_manager_unittest.cc b/chrome/browser/signin/signin_manager_unittest.cc index f6e132e..0b9bed7 100644 --- a/chrome/browser/signin/signin_manager_unittest.cc +++ b/chrome/browser/signin/signin_manager_unittest.cc @@ -19,13 +19,13 @@ #include "chrome/browser/signin/chrome_signin_client_factory.h" #include "chrome/browser/signin/fake_profile_oauth2_token_service.h" #include "chrome/browser/signin/fake_profile_oauth2_token_service_wrapper.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/child_process_security_policy.h" #include "content/public/browser/notification_source.h" #include "content/public/test/test_browser_thread_bundle.h" diff --git a/chrome/browser/signin/signin_tracker.cc b/chrome/browser/signin/signin_tracker.cc index 9d331d9..9e04a1a 100644 --- a/chrome/browser/signin/signin_tracker.cc +++ b/chrome/browser/signin/signin_tracker.cc @@ -6,10 +6,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/account_reconcilor_factory.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/common/profile_management_switches.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "google_apis/gaia/gaia_constants.h" #if !defined(OS_CHROMEOS) diff --git a/chrome/browser/signin/signin_tracker_unittest.cc b/chrome/browser/signin/signin_tracker_unittest.cc index 3f01a10..9df79b4 100644 --- a/chrome/browser/signin/signin_tracker_unittest.cc +++ b/chrome/browser/signin/signin_tracker_unittest.cc @@ -13,13 +13,13 @@ #include "chrome/browser/signin/fake_profile_oauth2_token_service.h" #include "chrome/browser/signin/fake_profile_oauth2_token_service_wrapper.h" #include "chrome/browser/signin/fake_signin_manager.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/test/base/testing_profile.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/gaia/gaia_constants.h" #include "google_apis/gaia/google_service_auth_error.h" diff --git a/chrome/browser/signin/signin_ui_util.cc b/chrome/browser/signin/signin_ui_util.cc index aee3bb9..dd48625 100644 --- a/chrome/browser/signin/signin_ui_util.cc +++ b/chrome/browser/signin/signin_ui_util.cc @@ -7,7 +7,6 @@ #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_global_error.h" #include "chrome/browser/signin/signin_global_error_factory.h" @@ -16,6 +15,7 @@ #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/browser/sync/sync_global_error.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc b/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc index 5774de3..2bf3e5e 100644 --- a/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc +++ b/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc @@ -8,13 +8,13 @@ #include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/sync/profile_sync_components_factory_impl.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" #include "chrome/test/base/testing_profile.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "components/sync_driver/data_type_controller.h" #include "content/public/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index 5757805..5bae7d1 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -34,7 +34,6 @@ #include "chrome/browser/services/gcm/gcm_profile_service_factory.h" #include "chrome/browser/signin/about_signin_internals.h" #include "chrome/browser/signin/about_signin_internals_factory.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -63,6 +62,7 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "components/sync_driver/data_type_controller.h" #include "components/sync_driver/system_encryptor.h" #include "components/sync_driver/user_selectable_sync_type.h" diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc index 79c8137b..b92296a 100644 --- a/chrome/browser/sync/profile_sync_service_factory.cc +++ b/chrome/browser/sync/profile_sync_service_factory.cc @@ -20,7 +20,6 @@ #include "chrome/browser/services/gcm/gcm_profile_service_factory.h" #include "chrome/browser/sessions/tab_restore_service_factory.h" #include "chrome/browser/signin/about_signin_internals_factory.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -32,6 +31,7 @@ #include "chrome/browser/webdata/web_data_service_factory.h" #include "chrome/common/pref_names.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "extensions/browser/extension_system_provider.h" #include "extensions/browser/extensions_browser_client.h" diff --git a/chrome/browser/sync/profile_sync_service_mock.cc b/chrome/browser/sync/profile_sync_service_mock.cc index aeefd04..7f9d981 100644 --- a/chrome/browser/sync/profile_sync_service_mock.cc +++ b/chrome/browser/sync/profile_sync_service_mock.cc @@ -5,7 +5,6 @@ #include "base/prefs/pref_service.h" #include "base/prefs/testing_pref_store.h" #include "chrome/browser/managed_mode/managed_user_signin_manager_wrapper.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -13,6 +12,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/testing_profile.h" +#include "components/signin/core/profile_oauth2_token_service.h" ProfileSyncServiceMock::ProfileSyncServiceMock(Profile* profile) : ProfileSyncService( diff --git a/chrome/browser/sync/profile_sync_service_session_unittest.cc b/chrome/browser/sync/profile_sync_service_session_unittest.cc index 1db6f96..f78a5cc 100644 --- a/chrome/browser/sync/profile_sync_service_session_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_session_unittest.cc @@ -22,7 +22,6 @@ #include "chrome/browser/sessions/session_tab_helper.h" #include "chrome/browser/signin/fake_profile_oauth2_token_service.h" #include "chrome/browser/signin/fake_profile_oauth2_token_service_wrapper.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -44,6 +43,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "chrome/test/base/testing_profile.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc b/chrome/browser/sync/profile_sync_service_startup_unittest.cc index 9c8ce39..a381bf0 100644 --- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc @@ -10,7 +10,6 @@ #include "chrome/browser/signin/fake_profile_oauth2_token_service.h" #include "chrome/browser/signin/fake_profile_oauth2_token_service_wrapper.h" #include "chrome/browser/signin/fake_signin_manager.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -21,6 +20,7 @@ #include "chrome/browser/sync/sync_prefs.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "components/sync_driver/data_type_manager.h" #include "components/sync_driver/data_type_manager_mock.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/sync/startup_controller.cc b/chrome/browser/sync/startup_controller.cc index b305ad7..88928d7 100644 --- a/chrome/browser/sync/startup_controller.cc +++ b/chrome/browser/sync/startup_controller.cc @@ -9,9 +9,9 @@ #include "base/metrics/histogram.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/managed_mode/managed_user_signin_manager_wrapper.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/sync/sync_prefs.h" #include "chrome/common/chrome_switches.h" +#include "components/signin/core/profile_oauth2_token_service.h" namespace browser_sync { diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc index 9c3c037..cf9400f 100644 --- a/chrome/browser/sync/sync_ui_util.cc +++ b/chrome/browser/sync/sync_ui_util.cc @@ -11,9 +11,7 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" -#include "chrome/browser/signin/signin_error_controller.h" #include "chrome/browser/signin/signin_manager_base.h" #include "chrome/browser/signin/signin_ui_util.h" #include "chrome/browser/sync/profile_sync_service.h" @@ -25,6 +23,8 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "components/signin/core/profile_oauth2_token_service.h" +#include "components/signin/core/signin_error_controller.h" #include "google_apis/gaia/google_service_auth_error.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/sync/sync_ui_util_unittest.cc b/chrome/browser/sync/sync_ui_util_unittest.cc index 1fb6ee6..97f85fd 100644 --- a/chrome/browser/sync/sync_ui_util_unittest.cc +++ b/chrome/browser/sync/sync_ui_util_unittest.cc @@ -8,11 +8,11 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/fake_auth_status_provider.h" #include "chrome/browser/signin/fake_signin_manager.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/browser/sync/sync_ui_util.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/test/test_browser_thread.h" #include "content/public/test/test_browser_thread_bundle.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc index 06e9a23..cd60324 100644 --- a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc +++ b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc @@ -24,7 +24,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/invalidation/p2p_invalidation_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager_base.h" #include "chrome/browser/sync/about_sync_util.h" @@ -37,6 +36,7 @@ #include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "components/sync_driver/data_type_controller.h" #include "content/public/browser/notification_service.h" #include "google_apis/gaia/gaia_constants.h" diff --git a/chrome/browser/sync/test/integration/sync_auth_test.cc b/chrome/browser/sync/test/integration/sync_auth_test.cc index 2c543c1..79258f0 100644 --- a/chrome/browser/sync/test/integration/sync_auth_test.cc +++ b/chrome/browser/sync/test/integration/sync_auth_test.cc @@ -5,13 +5,13 @@ #include "base/strings/stringprintf.h" #include "base/threading/platform_thread.h" #include "base/time/time.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/test/integration/bookmarks_helper.h" #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" #include "chrome/browser/sync/test/integration/single_client_status_change_checker.h" #include "chrome/browser/sync/test/integration/sync_test.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "google_apis/gaia/google_service_auth_error.h" #include "net/http/http_status_code.h" #include "net/url_request/url_request_status.h" diff --git a/chrome/browser/sync/test_profile_sync_service.h b/chrome/browser/sync/test_profile_sync_service.h index fff476d..d6d8967 100644 --- a/chrome/browser/sync/test_profile_sync_service.h +++ b/chrome/browser/sync/test_profile_sync_service.h @@ -10,11 +10,11 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/sync/glue/data_type_manager_impl.h" #include "chrome/browser/sync/glue/sync_backend_host_impl.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/sync_prefs.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "sync/test/engine/test_id_factory.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc index 329f8ce4..1c0fd5d 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc @@ -16,7 +16,6 @@ #include "chrome/browser/drive/drive_uploader.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -33,6 +32,7 @@ #include "chrome/browser/sync_file_system/file_status_observer.h" #include "chrome/browser/sync_file_system/logger.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/browser_thread.h" #include "extensions/browser/extension_system.h" #include "extensions/browser/extension_system_provider.h" diff --git a/chrome/browser/sync_file_system/drive_backend_v1/api_util.cc b/chrome/browser/sync_file_system/drive_backend_v1/api_util.cc index 6491146..7fdb29b 100644 --- a/chrome/browser/sync_file_system/drive_backend_v1/api_util.cc +++ b/chrome/browser/sync_file_system/drive_backend_v1/api_util.cc @@ -20,7 +20,6 @@ #include "chrome/browser/drive/drive_uploader.h" #include "chrome/browser/drive/gdata_wapi_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -28,6 +27,7 @@ #include "chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h" #include "chrome/browser/sync_file_system/logger.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/browser_thread.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/ui/app_list/search/people/people_provider.cc b/chrome/browser/ui/app_list/search/people/people_provider.cc index 0da4913..2cfc80c 100644 --- a/chrome/browser/ui/app_list/search/people/people_provider.cc +++ b/chrome/browser/ui/app_list/search/people/people_provider.cc @@ -14,13 +14,13 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search/search.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/ui/app_list/search/common/json_response_fetcher.h" #include "chrome/browser/ui/app_list/search/people/people_result.h" #include "chrome/browser/ui/app_list/search/people/person.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "google_apis/gaia/gaia_constants.h" #include "net/base/url_util.h" #include "url/gurl.h" diff --git a/chrome/browser/ui/app_list/search/people/people_result.cc b/chrome/browser/ui/app_list/search/people/people_result.cc index 8668d63..1613dd5 100644 --- a/chrome/browser/ui/app_list/search/people/people_result.cc +++ b/chrome/browser/ui/app_list/search/people/people_result.cc @@ -10,7 +10,6 @@ #include "base/memory/ref_counted.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -18,6 +17,7 @@ #include "chrome/browser/ui/app_list/search/people/person.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/common/extensions/api/hangouts_private.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/user_metrics.h" #include "extensions/browser/event_router.h" #include "extensions/browser/extension_system.h" diff --git a/chrome/browser/ui/auto_login_infobar_delegate.cc b/chrome/browser/ui/auto_login_infobar_delegate.cc index dea99b4..562d21c 100644 --- a/chrome/browser/ui/auto_login_infobar_delegate.cc +++ b/chrome/browser/ui/auto_login_infobar_delegate.cc @@ -15,13 +15,13 @@ #include "chrome/browser/infobars/infobar.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/ui/sync/sync_promo_ui.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/page_navigator.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/auto_login_prompter.cc b/chrome/browser/ui/auto_login_prompter.cc index 5953be8..c158fb7 100644 --- a/chrome/browser/ui/auto_login_prompter.cc +++ b/chrome/browser/ui/auto_login_prompter.cc @@ -10,7 +10,6 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/google/google_url_tracker.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -18,6 +17,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "components/auto_login_parser/auto_login_parser.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" #include "net/url_request/url_request.h" diff --git a/chrome/browser/ui/cocoa/browser/profile_chooser_controller.mm b/chrome/browser/ui/cocoa/browser/profile_chooser_controller.mm index c5b9163..e719fe0 100644 --- a/chrome/browser/ui/cocoa/browser/profile_chooser_controller.mm +++ b/chrome/browser/ui/cocoa/browser/profile_chooser_controller.mm @@ -20,8 +20,6 @@ #include "chrome/browser/profiles/profile_metrics.h" #include "chrome/browser/profiles/profile_window.h" #include "chrome/browser/profiles/profiles_state.h" -#include "chrome/browser/signin/mutable_profile_oauth2_token_service.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -35,6 +33,8 @@ #include "chrome/browser/ui/singleton_tabs.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "components/signin/core/mutable_profile_oauth2_token_service.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" diff --git a/chrome/browser/ui/cocoa/browser/profile_chooser_controller_unittest.mm b/chrome/browser/ui/cocoa/browser/profile_chooser_controller_unittest.mm index be80783..89617b7 100644 --- a/chrome/browser/ui/cocoa/browser/profile_chooser_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/browser/profile_chooser_controller_unittest.mm @@ -13,12 +13,12 @@ #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/signin/fake_profile_oauth2_token_service.h" #include "chrome/browser/signin/fake_profile_oauth2_token_service_wrapper.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" +#include "components/signin/core/profile_oauth2_token_service.h" const std::string kEmail = "user@gmail.com"; const std::string kSecondaryEmail = "user2@gmail.com"; diff --git a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm index 40fee0c..b50c651 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm @@ -13,9 +13,7 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/signin/fake_auth_status_provider.h" #include "chrome/browser/signin/fake_signin_manager.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" -#include "chrome/browser/signin/signin_error_controller.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/sync/profile_sync_service.h" @@ -30,6 +28,8 @@ #include "chrome/browser/ui/host_desktop.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" +#include "components/signin/core/profile_oauth2_token_service.h" +#include "components/signin/core/signin_error_controller.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_utils.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc index 3a26ed4..5555eed 100644 --- a/chrome/browser/ui/sync/one_click_signin_helper.cc +++ b/chrome/browser/ui/sync/one_click_signin_helper.cc @@ -36,9 +36,7 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/search/search.h" #include "chrome/browser/signin/chrome_signin_client.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" -#include "chrome/browser/signin/signin_error_controller.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/signin/signin_names_io_thread.h" @@ -64,7 +62,9 @@ #include "chrome/common/url_constants.h" #include "components/autofill/core/common/password_form.h" #include "components/password_manager/core/browser/password_manager.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "components/signin/core/signin_client.h" +#include "components/signin/core/signin_error_controller.h" #include "components/signin/core/signin_manager_cookie_helper.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_entry.h" diff --git a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc index 9a752f3..209f8aa 100644 --- a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc +++ b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc @@ -17,7 +17,6 @@ #include "chrome/browser/signin/fake_profile_oauth2_token_service.h" #include "chrome/browser/signin/fake_profile_oauth2_token_service_wrapper.h" #include "chrome/browser/signin/fake_signin_manager.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -36,6 +35,7 @@ #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" #include "components/autofill/core/common/password_form.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/views/profile_chooser_view.cc b/chrome/browser/ui/views/profile_chooser_view.cc index 45403c7..77f55ec 100644 --- a/chrome/browser/ui/views/profile_chooser_view.cc +++ b/chrome/browser/ui/views/profile_chooser_view.cc @@ -11,8 +11,6 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profile_window.h" #include "chrome/browser/profiles/profiles_state.h" -#include "chrome/browser/signin/mutable_profile_oauth2_token_service.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -23,6 +21,8 @@ #include "chrome/browser/ui/views/user_manager_view.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "components/signin/core/mutable_profile_oauth2_token_service.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.cc b/chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.cc index 2c61cd1..c5753c7 100644 --- a/chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.cc +++ b/chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.cc @@ -6,10 +6,10 @@ #include "chrome/browser/chromeos/login/oauth2_token_fetcher.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/web_ui.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc index 9443f55..27caf50 100644 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc @@ -10,7 +10,6 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "chrome/browser/local_discovery/test_service_discovery_client.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_base.h" @@ -21,6 +20,7 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" #include "chrome/test/base/web_ui_browsertest.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "google_apis/gaia/gaia_urls.h" #include "net/http/http_status_code.h" #include "net/url_request/test_url_fetcher_factory.h" diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc index 16f114e..e791a32 100644 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc @@ -23,7 +23,6 @@ #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h" #include "chrome/browser/printing/cloud_print/cloud_print_url.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager_base.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -32,6 +31,7 @@ #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/options/managed_user_import_handler.cc b/chrome/browser/ui/webui/options/managed_user_import_handler.cc index 3fcc7ab..fe2ae05 100644 --- a/chrome/browser/ui/webui/options/managed_user_import_handler.cc +++ b/chrome/browser/ui/webui/options/managed_user_import_handler.cc @@ -18,13 +18,13 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" -#include "chrome/browser/signin/signin_error_controller.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "components/signin/core/profile_oauth2_token_service.h" +#include "components/signin/core/signin_error_controller.h" #include "content/public/browser/web_ui.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/webui/options/managed_user_import_handler.h b/chrome/browser/ui/webui/options/managed_user_import_handler.h index a3ce80f..21a4932 100644 --- a/chrome/browser/ui/webui/options/managed_user_import_handler.h +++ b/chrome/browser/ui/webui/options/managed_user_import_handler.h @@ -9,8 +9,8 @@ #include "base/memory/weak_ptr.h" #include "base/scoped_observer.h" #include "chrome/browser/managed_mode/managed_user_sync_service_observer.h" -#include "chrome/browser/signin/signin_error_controller.h" #include "chrome/browser/ui/webui/options/options_ui.h" +#include "components/signin/core/signin_error_controller.h" namespace base { class DictionaryValue; diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc index 2461f59..01b03b9 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc @@ -35,7 +35,6 @@ #include "chrome/browser/printing/print_view_manager.h" #include "chrome/browser/printing/printer_manager_dialog.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_base.h" @@ -52,6 +51,7 @@ #include "chrome/common/crash_keys.h" #include "chrome/common/pref_names.h" #include "chrome/common/print_messages.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_controller.h" diff --git a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc index d40cbb0..d958036 100644 --- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc +++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc @@ -13,9 +13,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" -#include "chrome/browser/signin/signin_error_controller.h" #include "chrome/browser/signin/signin_oauth_helper.h" #include "chrome/browser/signin/signin_promo.h" #include "chrome/browser/sync/profile_sync_service.h" @@ -26,6 +24,8 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "components/signin/core/profile_oauth2_token_service.h" +#include "components/signin/core/signin_error_controller.h" #include "content/public/browser/storage_partition.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc index 75e862b..5ae85b5 100644 --- a/chrome/browser/ui/webui/sync_setup_handler.cc +++ b/chrome/browser/ui/webui/sync_setup_handler.cc @@ -23,9 +23,7 @@ #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profile_metrics.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" -#include "chrome/browser/signin/signin_error_controller.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/signin/signin_promo.h" #include "chrome/browser/sync/profile_sync_service.h" @@ -39,6 +37,8 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "components/signin/core/profile_oauth2_token_service.h" +#include "components/signin/core/signin_error_controller.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" diff --git a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc index b68d0c6..4b753f7 100644 --- a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc +++ b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc @@ -14,7 +14,6 @@ #include "base/values.h" #include "chrome/browser/signin/fake_auth_status_provider.h" #include "chrome/browser/signin/fake_signin_manager.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -24,9 +23,10 @@ #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "chrome/test/base/testing_profile.h" -#include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/scoped_testing_local_state.h" +#include "chrome/test/base/testing_browser_process.h" +#include "chrome/test/base/testing_profile.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "content/public/browser/web_ui.h" #include "content/public/test/test_browser_thread.h" #include "content/public/test/test_browser_thread_bundle.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 3e6c415d..8ba1e68 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2132,20 +2132,14 @@ 'browser/signin/easy_unlock_controller.h', 'browser/signin/local_auth.cc', 'browser/signin/local_auth.h', - 'browser/signin/mutable_profile_oauth2_token_service.cc', - 'browser/signin/mutable_profile_oauth2_token_service.h', 'browser/signin/principals_message_filter.cc', 'browser/signin/principals_message_filter.h', - 'browser/signin/profile_oauth2_token_service.cc', - 'browser/signin/profile_oauth2_token_service.h', 'browser/signin/profile_oauth2_token_service_factory.cc', 'browser/signin/profile_oauth2_token_service_factory.h', 'browser/signin/profile_oauth2_token_service_request.cc', 'browser/signin/profile_oauth2_token_service_request.h', 'browser/signin/signin_account_id_helper.cc', 'browser/signin/signin_account_id_helper.h', - 'browser/signin/signin_error_controller.cc', - 'browser/signin/signin_error_controller.h', 'browser/signin/signin_error_notifier_ash.cc', 'browser/signin/signin_error_notifier_ash.h', 'browser/signin/signin_error_notifier_factory_ash.cc', @@ -3379,8 +3373,6 @@ 'browser/ssl/ssl_add_cert_handler.cc', 'browser/ssl/ssl_client_auth_observer.cc', 'browser/status_icons/desktop_notification_balloon.cc', - 'browser/signin/mutable_profile_oauth2_token_service.cc', - 'browser/signin/mutable_profile_oauth2_token_service.h', 'browser/signin/signin_ui_util.cc', 'browser/sync/profile_sync_service_base.cc', 'browser/sync/sync_ui_util.cc', diff --git a/components/signin.gypi b/components/signin.gypi index f3506ab..2b83a0c 100644 --- a/components/signin.gypi +++ b/components/signin.gypi @@ -9,7 +9,10 @@ 'type': 'static_library', 'dependencies': [ '../base/base.gyp:base', + '../google_apis/google_apis.gyp:google_apis', + '../net/net.gyp:net', '../sql/sql.gyp:sql', + 'keyed_service_core', 'os_crypt', 'webdata_common', ], @@ -17,7 +20,13 @@ '..', ], 'sources': [ + 'signin/core/mutable_profile_oauth2_token_service.cc', + 'signin/core/mutable_profile_oauth2_token_service.h', + 'signin/core/profile_oauth2_token_service.cc', + 'signin/core/profile_oauth2_token_service.h', 'signin/core/signin_client.h', + 'signin/core/signin_error_controller.cc', + 'signin/core/signin_error_controller.h', 'signin/core/signin_manager_cookie_helper.cc', 'signin/core/signin_manager_cookie_helper.h', 'signin/core/webdata/token_service_table.cc', @@ -27,4 +36,13 @@ ], }, ], + 'conditions': [ + ['OS=="android"', { + 'sources!': [ + # Not used on Android. + 'signin/core/mutable_profile_oauth2_token_service.cc', + 'signin/core/mutable_profile_oauth2_token_service.h', + ], + }], + ], } diff --git a/components/signin/DEPS b/components/signin/DEPS index eddcc27..046e713 100644 --- a/components/signin/DEPS +++ b/components/signin/DEPS @@ -1,11 +1,11 @@ include_rules = [ + "+components/keyed_service/core", "+components/os_crypt", "+components/webdata/common", - "+google_apis/gaia/gaia_urls.h", + "+google_apis/gaia", "+grit", # For generated headers "+net", "+sql", - "+ui", # Signin is a layered component; subdirectories must explicitly introduce # the ability to use the content layer as appropriate. "-components/signin/content", diff --git a/chrome/browser/signin/mutable_profile_oauth2_token_service.cc b/components/signin/core/mutable_profile_oauth2_token_service.cc index b61b251..75e7c86 100644 --- a/chrome/browser/signin/mutable_profile_oauth2_token_service.cc +++ b/components/signin/core/mutable_profile_oauth2_token_service.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/signin/mutable_profile_oauth2_token_service.h" +#include "components/signin/core/mutable_profile_oauth2_token_service.h" #include "components/signin/core/signin_client.h" #include "components/signin/core/webdata/token_web_data.h" diff --git a/chrome/browser/signin/mutable_profile_oauth2_token_service.h b/components/signin/core/mutable_profile_oauth2_token_service.h index af6f92c..b9ebc6e 100644 --- a/chrome/browser/signin/mutable_profile_oauth2_token_service.h +++ b/components/signin/core/mutable_profile_oauth2_token_service.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_SIGNIN_MUTABLE_PROFILE_OAUTH2_TOKEN_SERVICE_H_ -#define CHROME_BROWSER_SIGNIN_MUTABLE_PROFILE_OAUTH2_TOKEN_SERVICE_H_ +#ifndef COMPONENTS_SIGNIN_CORE_MUTABLE_PROFILE_OAUTH2_TOKEN_SERVICE_H_ +#define COMPONENTS_SIGNIN_CORE_MUTABLE_PROFILE_OAUTH2_TOKEN_SERVICE_H_ #include "base/memory/scoped_vector.h" #include "base/threading/thread_checker.h" -#include "chrome/browser/signin/profile_oauth2_token_service.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "components/webdata/common/web_data_service_base.h" #include "components/webdata/common/web_data_service_consumer.h" @@ -141,4 +141,4 @@ class MutableProfileOAuth2TokenService : public ProfileOAuth2TokenService, DISALLOW_COPY_AND_ASSIGN(MutableProfileOAuth2TokenService); }; -#endif // CHROME_BROWSER_SIGNIN_MUTABLE_PROFILE_OAUTH2_TOKEN_SERVICE_H_ +#endif // COMPONENTS_SIGNIN_CORE_MUTABLE_PROFILE_OAUTH2_TOKEN_SERVICE_H_ diff --git a/chrome/browser/signin/profile_oauth2_token_service.cc b/components/signin/core/profile_oauth2_token_service.cc index 25fa010..21270124 100644 --- a/chrome/browser/signin/profile_oauth2_token_service.cc +++ b/components/signin/core/profile_oauth2_token_service.cc @@ -2,19 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/signin/profile_oauth2_token_service.h" +#include "components/signin/core/profile_oauth2_token_service.h" #include "base/bind.h" #include "base/message_loop/message_loop.h" #include "base/stl_util.h" #include "base/time/time.h" -#include "chrome/browser/profiles/profile.h" -#include "chrome/browser/signin/signin_error_controller.h" -#include "chrome/browser/signin/signin_global_error_factory.h" +#include "components/signin/core/signin_error_controller.h" #include "net/url_request/url_request_context_getter.h" ProfileOAuth2TokenService::ProfileOAuth2TokenService() - : client_(NULL), profile_(NULL) {} + : client_(NULL) {} ProfileOAuth2TokenService::~ProfileOAuth2TokenService() { DCHECK(!signin_error_controller_.get()) << @@ -22,20 +20,16 @@ ProfileOAuth2TokenService::~ProfileOAuth2TokenService() { "ProfileOAuth2TokenService::Shutdown"; } -void ProfileOAuth2TokenService::Initialize(SigninClient* client, - Profile* profile) { +void ProfileOAuth2TokenService::Initialize(SigninClient* client) { DCHECK(client); DCHECK(!client_); client_ = client; - DCHECK(profile); - DCHECK(!profile_); - profile_ = profile; signin_error_controller_.reset(new SigninErrorController()); } void ProfileOAuth2TokenService::Shutdown() { - DCHECK(profile_) << "Shutdown() called without matching call to Initialize()"; + DCHECK(client_) << "Shutdown() called without matching call to Initialize()"; signin_error_controller_.reset(); } diff --git a/chrome/browser/signin/profile_oauth2_token_service.h b/components/signin/core/profile_oauth2_token_service.h index d0f7f62..b4ede3a 100644 --- a/chrome/browser/signin/profile_oauth2_token_service.h +++ b/components/signin/core/profile_oauth2_token_service.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_SIGNIN_PROFILE_OAUTH2_TOKEN_SERVICE_H_ -#define CHROME_BROWSER_SIGNIN_PROFILE_OAUTH2_TOKEN_SERVICE_H_ +#ifndef COMPONENTS_SIGNIN_CORE_PROFILE_OAUTH2_TOKEN_SERVICE_H_ +#define COMPONENTS_SIGNIN_CORE_PROFILE_OAUTH2_TOKEN_SERVICE_H_ #include <string> #include "base/gtest_prod_util.h" #include "base/memory/linked_ptr.h" -#include "chrome/browser/signin/signin_error_controller.h" #include "components/keyed_service/core/keyed_service.h" +#include "components/signin/core/signin_error_controller.h" #include "google_apis/gaia/oauth2_token_service.h" namespace net { @@ -18,7 +18,6 @@ class URLRequestContextGetter; } class GoogleServiceAuthError; -class Profile; class SigninClient; // ProfileOAuth2TokenService is a class that retrieves @@ -39,10 +38,8 @@ class ProfileOAuth2TokenService : public OAuth2TokenService { public: virtual ~ProfileOAuth2TokenService(); - // Initializes this token service with the SigninClient and profile. - // TODO(blundell): Eliminate this class knowing about Profile. - // crbug.com/334217 - virtual void Initialize(SigninClient* client, Profile* profile); + // Initializes this token service with the SigninClient. + virtual void Initialize(SigninClient* client); virtual void Shutdown(); @@ -98,13 +95,10 @@ class ProfileOAuth2TokenService : public OAuth2TokenService { // The client with which this instance was initialized, or NULL. SigninClient* client_; - // The profile with which this instance was initialized, or NULL. - Profile* profile_; - // Used to expose auth errors to the UI. scoped_ptr<SigninErrorController> signin_error_controller_; DISALLOW_COPY_AND_ASSIGN(ProfileOAuth2TokenService); }; -#endif // CHROME_BROWSER_SIGNIN_PROFILE_OAUTH2_TOKEN_SERVICE_H_ +#endif // COMPONENTS_SIGNIN_CORE_PROFILE_OAUTH2_TOKEN_SERVICE_H_ diff --git a/chrome/browser/signin/signin_error_controller.cc b/components/signin/core/signin_error_controller.cc index 94fd840..e3e93c8 100644 --- a/chrome/browser/signin/signin_error_controller.cc +++ b/components/signin/core/signin_error_controller.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/signin/signin_error_controller.h" +#include "components/signin/core/signin_error_controller.h" namespace { diff --git a/chrome/browser/signin/signin_error_controller.h b/components/signin/core/signin_error_controller.h index 321060c..c66963e 100644 --- a/chrome/browser/signin/signin_error_controller.h +++ b/components/signin/core/signin_error_controller.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_SIGNIN_SIGNIN_ERROR_CONTROLLER_H_ -#define CHROME_BROWSER_SIGNIN_SIGNIN_ERROR_CONTROLLER_H_ +#ifndef COMPONENTS_SIGNIN_CORE_SIGNIN_ERROR_CONTROLLER_H_ +#define COMPONENTS_SIGNIN_CORE_SIGNIN_ERROR_CONTROLLER_H_ #include <set> #include "base/basictypes.h" @@ -76,4 +76,4 @@ class SigninErrorController { DISALLOW_COPY_AND_ASSIGN(SigninErrorController); }; -#endif // CHROME_BROWSER_SIGNIN_SIGNIN_ERROR_CONTROLLER_H_ +#endif // COMPONENTS_SIGNIN_CORE_SIGNIN_ERROR_CONTROLLER_H_ |