diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 04:26:37 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 04:26:37 +0000 |
| commit | 6386cf58a85361fa20bba6ecfc23502e922b9a90 (patch) | |
| tree | 06f9a9aa7e6bb8db149b53bc7489e69fa87c07fb | |
| parent | f2857ecf6c8da488feeca9b05cf2c046ea43e02f (diff) | |
| download | chromium_src-6386cf58a85361fa20bba6ecfc23502e922b9a90.zip chromium_src-6386cf58a85361fa20bba6ecfc23502e922b9a90.tar.gz chromium_src-6386cf58a85361fa20bba6ecfc23502e922b9a90.tar.bz2 | |
Moving google_apis and GaiaClient to src/google_apis.
TBR=mechanicalowners@chromium.org
BUG=145584
Review URL: https://chromiumcodereview.appspot.com/10928017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155312 0039d316-1c4b-4281-b951-d872f2087c98
174 files changed, 425 insertions, 380 deletions
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index 62dd84f..99d25e3 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -6,6 +6,7 @@ include_rules = [ "+chromeos", "+content/public/browser", "+google/cacheinvalidation", # Sync invalidation API protobuf files. + "+google_apis", "+google_update", "+grit", # For generated headers "+installer_util_strings", # For generated headers diff --git a/chrome/browser/chrome_to_mobile_service.cc b/chrome/browser/chrome_to_mobile_service.cc index 96f0963..117f9bc 100644 --- a/chrome/browser/chrome_to_mobile_service.cc +++ b/chrome/browser/chrome_to_mobile_service.cc @@ -30,9 +30,6 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/cloud_print/cloud_print_helpers.h" #include "chrome/common/extensions/extension_switch_utils.h" -#include "chrome/common/net/gaia/gaia_constants.h" -#include "chrome/common/net/gaia/gaia_urls.h" -#include "chrome/common/net/gaia/oauth2_access_token_fetcher.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" @@ -41,6 +38,9 @@ #include "content/public/browser/web_contents.h" #include "google/cacheinvalidation/include/types.h" #include "google/cacheinvalidation/types.pb.h" +#include "google_apis/gaia/gaia_constants.h" +#include "google_apis/gaia/gaia_urls.h" +#include "google_apis/gaia/oauth2_access_token_fetcher.h" #include "net/base/escape.h" #include "net/base/load_flags.h" #include "net/url_request/url_fetcher.h" diff --git a/chrome/browser/chrome_to_mobile_service.h b/chrome/browser/chrome_to_mobile_service.h index 162180d..cb84e40 100644 --- a/chrome/browser/chrome_to_mobile_service.h +++ b/chrome/browser/chrome_to_mobile_service.h @@ -19,9 +19,9 @@ #include "base/values.h" #include "chrome/browser/profiles/profile_keyed_service.h" #include "chrome/browser/sessions/session_id.h" -#include "chrome/common/net/gaia/oauth2_access_token_consumer.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "google_apis/gaia/oauth2_access_token_consumer.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_fetcher_delegate.h" #include "sync/notifier/invalidation_handler.h" diff --git a/chrome/browser/chrome_to_mobile_service_unittest.cc b/chrome/browser/chrome_to_mobile_service_unittest.cc index 8cff191..029ece6 100644 --- a/chrome/browser/chrome_to_mobile_service_unittest.cc +++ b/chrome/browser/chrome_to_mobile_service_unittest.cc @@ -6,9 +6,9 @@ #include "chrome/browser/signin/token_service.h" #include "chrome/common/chrome_notification_types.h" -#include "chrome/common/net/gaia/gaia_constants.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "google_apis/gaia/gaia_constants.h" #include "testing/gmock/include/gmock/gmock.h" namespace { diff --git a/chrome/browser/chromeos/gdata/auth_service.cc b/chrome/browser/chromeos/gdata/auth_service.cc index 536bca1..3e48464 100644 --- a/chrome/browser/chromeos/gdata/auth_service.cc +++ b/chrome/browser/chromeos/gdata/auth_service.cc @@ -15,11 +15,11 @@ #include "chrome/browser/signin/token_service.h" #include "chrome/browser/signin/token_service_factory.h" #include "chrome/common/chrome_notification_types.h" -#include "chrome/common/net/gaia/gaia_constants.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" +#include "google_apis/gaia/gaia_constants.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/gdata/auth_service.h b/chrome/browser/chromeos/gdata/auth_service.h index 43555fa..01f1271 100644 --- a/chrome/browser/chromeos/gdata/auth_service.h +++ b/chrome/browser/chromeos/gdata/auth_service.h @@ -12,9 +12,9 @@ #include "base/observer_list.h" #include "chrome/browser/chromeos/gdata/gdata_errorcode.h" #include "chrome/browser/chromeos/gdata/operations_base.h" -#include "chrome/common/net/gaia/oauth2_access_token_fetcher.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "google_apis/gaia/oauth2_access_token_fetcher.h" class Profile; diff --git a/chrome/browser/chromeos/gdata/operations_base.cc b/chrome/browser/chromeos/gdata/operations_base.cc index 7a82d95..f90c872 100644 --- a/chrome/browser/chromeos/gdata/operations_base.cc +++ b/chrome/browser/chromeos/gdata/operations_base.cc @@ -10,11 +10,11 @@ #include "base/stringprintf.h" #include "base/values.h" #include "chrome/browser/browser_process.h" -#include "chrome/common/net/gaia/gaia_urls.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" -#include "chrome/common/net/gaia/oauth2_access_token_fetcher.h" #include "chrome/common/net/url_util.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/gaia/gaia_urls.h" +#include "google_apis/gaia/google_service_auth_error.h" +#include "google_apis/gaia/oauth2_access_token_fetcher.h" #include "net/base/load_flags.h" #include "net/http/http_util.h" #include "net/url_request/url_fetcher.h" diff --git a/chrome/browser/chromeos/gdata/operations_base.h b/chrome/browser/chromeos/gdata/operations_base.h index 85f7883..2964c86 100644 --- a/chrome/browser/chromeos/gdata/operations_base.h +++ b/chrome/browser/chromeos/gdata/operations_base.h @@ -11,7 +11,7 @@ #include "base/callback.h" #include "chrome/browser/chromeos/gdata/gdata_errorcode.h" #include "chrome/browser/chromeos/gdata/operation_registry.h" -#include "chrome/common/net/gaia/oauth2_access_token_consumer.h" +#include "google_apis/gaia/oauth2_access_token_consumer.h" #include "googleurl/src/gurl.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_fetcher.h" diff --git a/chrome/browser/chromeos/login/auth_attempt_state.cc b/chrome/browser/chromeos/login/auth_attempt_state.cc index 6d2ebd8..4bbe826 100644 --- a/chrome/browser/chromeos/login/auth_attempt_state.cc +++ b/chrome/browser/chromeos/login/auth_attempt_state.cc @@ -6,9 +6,9 @@ #include <string> -#include "chrome/common/net/gaia/gaia_auth_consumer.h" -#include "chrome/common/net/gaia/gaia_auth_fetcher.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/gaia_auth_fetcher.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/login/auth_attempt_state.h b/chrome/browser/chromeos/login/auth_attempt_state.h index 7bca5bc..90c3b06 100644 --- a/chrome/browser/chromeos/login/auth_attempt_state.h +++ b/chrome/browser/chromeos/login/auth_attempt_state.h @@ -8,8 +8,8 @@ #include <string> #include "chrome/browser/chromeos/login/login_status_consumer.h" -#include "chrome/common/net/gaia/gaia_auth_consumer.h" -#include "chrome/common/net/gaia/gaia_auth_fetcher.h" +#include "google_apis/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/gaia_auth_fetcher.h" #include "third_party/cros_system_api/dbus/service_constants.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/authenticator.h b/chrome/browser/chromeos/login/authenticator.h index 1ac1c22..7e08398 100644 --- a/chrome/browser/chromeos/login/authenticator.h +++ b/chrome/browser/chromeos/login/authenticator.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "chrome/browser/chromeos/login/login_status_consumer.h" -#include "chrome/common/net/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/gaia_auth_consumer.h" class Profile; diff --git a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc index 2e30d20..2121616 100644 --- a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc +++ b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc @@ -17,9 +17,9 @@ #include "chrome/browser/policy/browser_policy_connector.h" #include "chrome/browser/policy/cloud_policy_data_store.h" #include "chrome/browser/policy/enterprise_metrics.h" -#include "chrome/common/net/gaia/gaia_auth_util.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/session_manager_client.h" +#include "google_apis/gaia/gaia_auth_util.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/enrollment/mock_enterprise_enrollment_screen.h b/chrome/browser/chromeos/login/enrollment/mock_enterprise_enrollment_screen.h index de21be1..b60c4d2d 100644 --- a/chrome/browser/chromeos/login/enrollment/mock_enterprise_enrollment_screen.h +++ b/chrome/browser/chromeos/login/enrollment/mock_enterprise_enrollment_screen.h @@ -7,7 +7,7 @@ #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.h" #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen_actor.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "testing/gmock/include/gmock/gmock.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc index 40da2ca..1b8744e 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.cc +++ b/chrome/browser/chromeos/login/existing_user_controller.cc @@ -40,7 +40,6 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/common/net/url_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" @@ -50,6 +49,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/user_metrics.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "grit/generated_resources.h" #include "net/http/http_auth_cache.h" #include "net/http/http_network_session.h" diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc index 15a5a74..2cddcda 100644 --- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc @@ -22,11 +22,11 @@ #include "chrome/browser/chromeos/login/mock_user_manager.h" #include "chrome/browser/chromeos/login/wizard_controller.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/net/gaia/mock_url_fetcher_factory.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/ui_test_utils.h" #include "chromeos/dbus/mock_dbus_thread_manager.h" #include "chromeos/dbus/mock_session_manager_client.h" +#include "google_apis/gaia/mock_url_fetcher_factory.h" #include "grit/generated_resources.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/login/login_performer.cc b/chrome/browser/chromeos/login/login_performer.cc index 169d6d4..9a1a781 100644 --- a/chrome/browser/chromeos/login/login_performer.cc +++ b/chrome/browser/chromeos/login/login_performer.cc @@ -24,7 +24,6 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/net/gaia/gaia_auth_util.h" #include "chrome/common/pref_names.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/session_manager_client.h" @@ -32,6 +31,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/user_metrics.h" +#include "google_apis/gaia/gaia_auth_util.h" #include "grit/generated_resources.h" #include "net/cookies/cookie_monster.h" #include "net/cookies/cookie_store.h" diff --git a/chrome/browser/chromeos/login/login_performer.h b/chrome/browser/chromeos/login/login_performer.h index db7611a..3ed7a87 100644 --- a/chrome/browser/chromeos/login/login_performer.h +++ b/chrome/browser/chromeos/login/login_performer.h @@ -13,9 +13,9 @@ #include "chrome/browser/chromeos/login/login_status_consumer.h" #include "chrome/browser/chromeos/login/online_attempt_host.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "google_apis/gaia/google_service_auth_error.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/login_status_consumer.h b/chrome/browser/chromeos/login/login_status_consumer.h index 3b13f53..af9c4ad 100644 --- a/chrome/browser/chromeos/login/login_status_consumer.h +++ b/chrome/browser/chromeos/login/login_status_consumer.h @@ -8,8 +8,8 @@ #include <string> #include "base/logging.h" -#include "chrome/common/net/gaia/gaia_auth_consumer.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" +#include "google_apis/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "net/base/net_errors.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc index 67e4ed9..3bba890 100644 --- a/chrome/browser/chromeos/login/login_utils.cc +++ b/chrome/browser/chromeos/login/login_utils.cc @@ -66,8 +66,6 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/logging_chrome.h" -#include "chrome/common/net/gaia/gaia_auth_consumer.h" -#include "chrome/common/net/gaia/gaia_urls.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chromeos/chromeos_switches.h" @@ -76,6 +74,8 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_service.h" +#include "google_apis/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/gaia_urls.h" #include "googleurl/src/gurl.h" #include "media/base/media_switches.h" #include "net/base/network_change_notifier.h" diff --git a/chrome/browser/chromeos/login/login_utils.h b/chrome/browser/chromeos/login/login_utils.h index ed127ab..6501e6e 100644 --- a/chrome/browser/chromeos/login/login_utils.h +++ b/chrome/browser/chromeos/login/login_utils.h @@ -8,7 +8,7 @@ #include <string> #include "base/memory/ref_counted.h" -#include "chrome/common/net/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/gaia_auth_consumer.h" class CommandLine; class GURL; diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc index 97046c7..cb740cb 100644 --- a/chrome/browser/chromeos/login/login_utils_browsertest.cc +++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc @@ -26,8 +26,6 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/net/gaia/gaia_auth_consumer.h" -#include "chrome/common/net/gaia/gaia_urls.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_pref_service.h" @@ -36,6 +34,8 @@ #include "chromeos/dbus/mock_session_manager_client.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread.h" +#include "google_apis/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/gaia_urls.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_fetcher_delegate.h" #include "net/url_request/url_request.h" diff --git a/chrome/browser/chromeos/login/mock_authenticator.h b/chrome/browser/chromeos/login/mock_authenticator.h index 58adf04..be9333d 100644 --- a/chrome/browser/chromeos/login/mock_authenticator.h +++ b/chrome/browser/chromeos/login/mock_authenticator.h @@ -11,8 +11,8 @@ #include "base/memory/ref_counted.h" #include "chrome/browser/chromeos/login/authenticator.h" #include "chrome/browser/chromeos/login/login_utils.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "testing/gtest/include/gtest/gtest.h" class Profile; diff --git a/chrome/browser/chromeos/login/mock_login_status_consumer.cc b/chrome/browser/chromeos/login/mock_login_status_consumer.cc index 2c72ab4..e2b04e6 100644 --- a/chrome/browser/chromeos/login/mock_login_status_consumer.cc +++ b/chrome/browser/chromeos/login/mock_login_status_consumer.cc @@ -5,7 +5,7 @@ #include "chrome/browser/chromeos/login/mock_login_status_consumer.h" #include "base/message_loop.h" -#include "chrome/common/net/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/gaia_auth_consumer.h" #include "testing/gtest/include/gtest/gtest.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/mock_login_utils.h b/chrome/browser/chromeos/login/mock_login_utils.h index 19f144f..e012ef4 100644 --- a/chrome/browser/chromeos/login/mock_login_utils.h +++ b/chrome/browser/chromeos/login/mock_login_utils.h @@ -12,7 +12,7 @@ #include "chrome/browser/chromeos/login/authenticator.h" #include "chrome/browser/chromeos/login/login_display_host.h" #include "chrome/browser/chromeos/login/login_utils.h" -#include "chrome/common/net/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/gaia_auth_consumer.h" #include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/chromeos/login/oauth1_token_fetcher.cc b/chrome/browser/chromeos/login/oauth1_token_fetcher.cc index 38bd4af..c0512a7 100644 --- a/chrome/browser/chromeos/login/oauth1_token_fetcher.cc +++ b/chrome/browser/chromeos/login/oauth1_token_fetcher.cc @@ -8,8 +8,8 @@ #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/network_library.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/gaia/google_service_auth_error.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/login/oauth_login_verifier.cc b/chrome/browser/chromeos/login/oauth_login_verifier.cc index ec11159..dba0f4a 100644 --- a/chrome/browser/chromeos/login/oauth_login_verifier.cc +++ b/chrome/browser/chromeos/login/oauth_login_verifier.cc @@ -9,9 +9,9 @@ #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/network_library.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/common/net/gaia/gaia_constants.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/gaia/gaia_constants.h" +#include "google_apis/gaia/google_service_auth_error.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/login/oauth_login_verifier.h b/chrome/browser/chromeos/login/oauth_login_verifier.h index 9209da5..6ee0864 100644 --- a/chrome/browser/chromeos/login/oauth_login_verifier.h +++ b/chrome/browser/chromeos/login/oauth_login_verifier.h @@ -12,8 +12,8 @@ #include "base/memory/weak_ptr.h" #include "chrome/browser/net/gaia/gaia_oauth_consumer.h" #include "chrome/browser/net/gaia/gaia_oauth_fetcher.h" -#include "chrome/common/net/gaia/gaia_auth_consumer.h" -#include "chrome/common/net/gaia/gaia_auth_fetcher.h" +#include "google_apis/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/gaia_auth_fetcher.h" class Profile; diff --git a/chrome/browser/chromeos/login/online_attempt.cc b/chrome/browser/chromeos/login/online_attempt.cc index 33f7948..ddc3fec 100644 --- a/chrome/browser/chromeos/login/online_attempt.cc +++ b/chrome/browser/chromeos/login/online_attempt.cc @@ -14,10 +14,10 @@ #include "chrome/browser/chromeos/login/auth_attempt_state_resolver.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/common/net/gaia/gaia_auth_consumer.h" -#include "chrome/common/net/gaia/gaia_auth_fetcher.h" -#include "chrome/common/net/gaia/gaia_constants.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/gaia_auth_fetcher.h" +#include "google_apis/gaia/gaia_constants.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" #include "net/url_request/url_request_status.h" diff --git a/chrome/browser/chromeos/login/online_attempt.h b/chrome/browser/chromeos/login/online_attempt.h index 1e733d5..6516682 100644 --- a/chrome/browser/chromeos/login/online_attempt.h +++ b/chrome/browser/chromeos/login/online_attempt.h @@ -15,8 +15,8 @@ #include "chrome/browser/chromeos/login/login_status_consumer.h" #include "chrome/browser/net/gaia/gaia_oauth_consumer.h" #include "chrome/browser/net/gaia/gaia_oauth_fetcher.h" -#include "chrome/common/net/gaia/gaia_auth_consumer.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" +#include "google_apis/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/google_service_auth_error.h" class GaiaAuthFetcher; class Profile; diff --git a/chrome/browser/chromeos/login/online_attempt_host.cc b/chrome/browser/chromeos/login/online_attempt_host.cc index 8674bd5..2193a66 100644 --- a/chrome/browser/chromeos/login/online_attempt_host.cc +++ b/chrome/browser/chromeos/login/online_attempt_host.cc @@ -9,8 +9,8 @@ #include "chrome/browser/chromeos/login/auth_attempt_state.h" #include "chrome/browser/chromeos/login/online_attempt.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/net/gaia/gaia_auth_util.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/gaia/gaia_auth_util.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/online_attempt_unittest.cc b/chrome/browser/chromeos/login/online_attempt_unittest.cc index a3872cb..e6a8c01 100644 --- a/chrome/browser/chromeos/login/online_attempt_unittest.cc +++ b/chrome/browser/chromeos/login/online_attempt_unittest.cc @@ -13,10 +13,10 @@ #include "chrome/browser/chromeos/login/mock_url_fetchers.h" #include "chrome/browser/chromeos/login/online_attempt.h" #include "chrome/browser/chromeos/login/test_attempt_state.h" -#include "chrome/common/net/gaia/gaia_auth_consumer.h" -#include "chrome/common/net/gaia/mock_url_fetcher_factory.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" +#include "google_apis/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/mock_url_fetcher_factory.h" #include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/login/parallel_authenticator.cc b/chrome/browser/chromeos/login/parallel_authenticator.cc index 83a576d..cf27c27 100644 --- a/chrome/browser/chromeos/login/parallel_authenticator.cc +++ b/chrome/browser/chromeos/login/parallel_authenticator.cc @@ -21,13 +21,13 @@ #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/net/gaia/gaia_auth_util.h" #include "chromeos/cryptohome/async_method_caller.h" #include "chromeos/dbus/cryptohome_client.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "crypto/sha2.h" +#include "google_apis/gaia/gaia_auth_util.h" #include "third_party/cros_system_api/dbus/service_constants.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/login/parallel_authenticator.h b/chrome/browser/chromeos/login/parallel_authenticator.h index a7ab996..a67a7e6 100644 --- a/chrome/browser/chromeos/login/parallel_authenticator.h +++ b/chrome/browser/chromeos/login/parallel_authenticator.h @@ -18,7 +18,7 @@ #include "chrome/browser/chromeos/login/online_attempt.h" #include "chrome/browser/chromeos/login/test_attempt_state.h" #include "chrome/browser/chromeos/settings/device_settings_service.h" -#include "chrome/common/net/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/gaia_auth_consumer.h" class LoginFailure; class Profile; diff --git a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc index 3b6bc70..3f4a6fb 100644 --- a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc +++ b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc @@ -22,12 +22,12 @@ #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/settings/device_settings_test_helper.h" #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h" -#include "chrome/common/net/gaia/mock_url_fetcher_factory.h" #include "chrome/test/base/testing_profile.h" #include "chromeos/cryptohome/mock_async_method_caller.h" #include "chromeos/dbus/mock_cryptohome_client.h" #include "chromeos/dbus/mock_dbus_thread_manager.h" #include "content/public/test/test_browser_thread.h" +#include "google_apis/gaia/mock_url_fetcher_factory.h" #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/url_request/url_request_status.h" diff --git a/chrome/browser/chromeos/login/policy_oauth_fetcher.cc b/chrome/browser/chromeos/login/policy_oauth_fetcher.cc index add6120b..bcd3118 100644 --- a/chrome/browser/chromeos/login/policy_oauth_fetcher.cc +++ b/chrome/browser/chromeos/login/policy_oauth_fetcher.cc @@ -10,8 +10,8 @@ #include "chrome/browser/policy/user_cloud_policy_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/common/net/gaia/gaia_constants.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" +#include "google_apis/gaia/gaia_constants.h" +#include "google_apis/gaia/google_service_auth_error.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/test_attempt_state.cc b/chrome/browser/chromeos/login/test_attempt_state.cc index 06c40ff..2e9120a 100644 --- a/chrome/browser/chromeos/login/test_attempt_state.cc +++ b/chrome/browser/chromeos/login/test_attempt_state.cc @@ -6,7 +6,7 @@ #include <string> -#include "chrome/common/net/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/gaia_auth_consumer.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/test_attempt_state.h b/chrome/browser/chromeos/login/test_attempt_state.h index ba8b1cb..06a113a 100644 --- a/chrome/browser/chromeos/login/test_attempt_state.h +++ b/chrome/browser/chromeos/login/test_attempt_state.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "chrome/browser/chromeos/login/auth_attempt_state.h" #include "chrome/browser/chromeos/login/login_status_consumer.h" -#include "chrome/common/net/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/gaia_auth_consumer.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/user_manager_impl.cc b/chrome/browser/chromeos/login/user_manager_impl.cc index 803c64f..1b17c5d 100644 --- a/chrome/browser/chromeos/login/user_manager_impl.cc +++ b/chrome/browser/chromeos/login/user_manager_impl.cc @@ -45,12 +45,12 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/common/pref_names.h" #include "chromeos/cryptohome/async_method_caller.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/common/url_constants.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/png_codec.h" diff --git a/chrome/browser/chromeos/settings/cros_settings.cc b/chrome/browser/chromeos/settings/cros_settings.cc index f0592f3..c56d4b2 100644 --- a/chrome/browser/chromeos/settings/cros_settings.cc +++ b/chrome/browser/chromeos/settings/cros_settings.cc @@ -16,10 +16,10 @@ #include "chrome/browser/chromeos/settings/system_settings_provider.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/net/gaia/gaia_auth_util.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" +#include "google_apis/gaia/gaia_auth_util.h" namespace chromeos { diff --git a/chrome/browser/extensions/api/identity/identity_api.h b/chrome/browser/extensions/api/identity/identity_api.h index 502e7ea..43fa148 100644 --- a/chrome/browser/extensions/api/identity/identity_api.h +++ b/chrome/browser/extensions/api/identity/identity_api.h @@ -11,10 +11,10 @@ #include "base/memory/weak_ptr.h" #include "chrome/browser/extensions/api/identity/web_auth_flow.h" #include "chrome/browser/extensions/app_notify_channel_setup.h" -#include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/extension_function.h" +#include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/ui/webui/signin/login_ui_service.h" -#include "chrome/common/net/gaia/oauth2_mint_token_flow.h" +#include "google_apis/gaia/oauth2_mint_token_flow.h" class GetAuthTokenFunctionTest; class MockGetAuthTokenFunction; diff --git a/chrome/browser/extensions/api/identity/identity_apitest.cc b/chrome/browser/extensions/api/identity/identity_apitest.cc index 08f81fb..6a64a6f 100644 --- a/chrome/browser/extensions/api/identity/identity_apitest.cc +++ b/chrome/browser/extensions/api/identity/identity_apitest.cc @@ -10,10 +10,10 @@ #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_function_test_utils.h" #include "chrome/browser/ui/webui/signin/login_ui_service.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" -#include "chrome/common/net/gaia/oauth2_mint_token_flow.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/in_process_browser_test.h" +#include "google_apis/gaia/google_service_auth_error.h" +#include "google_apis/gaia/oauth2_mint_token_flow.h" #include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.cc b/chrome/browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.cc index 0d8ffd0..9fe958a 100644 --- a/chrome/browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.cc +++ b/chrome/browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.cc @@ -8,7 +8,7 @@ #include "base/json/json_reader.h" #include "base/values.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_request_status.h" diff --git a/chrome/browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.h b/chrome/browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.h index a19fb33..54065dc 100644 --- a/chrome/browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.h +++ b/chrome/browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.h @@ -7,7 +7,7 @@ #include <string> -#include "chrome/common/net/gaia/oauth2_api_call_flow.h" +#include "google_apis/gaia/oauth2_api_call_flow.h" class GoogleServiceAuthError; diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_api.h b/chrome/browser/extensions/api/push_messaging/push_messaging_api.h index 56ed882..992c898 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_api.h +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_api.h @@ -11,12 +11,12 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" +#include "chrome/browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.h" #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_delegate.h" +#include "chrome/browser/extensions/extension_function.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "chrome/browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.h" -#include "chrome/browser/extensions/extension_function.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" +#include "google_apis/gaia/google_service_auth_error.h" class Profile; diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc index 3a77bb1..6aae054 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc @@ -29,12 +29,12 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_error_utils.h" #include "chrome/common/extensions/extension_l10n_util.h" -#include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/common/pref_names.h" #include "content/public/browser/gpu_data_manager.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/web_contents.h" +#include "google_apis/gaia/gaia_constants.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.h b/chrome/browser/extensions/api/webstore_private/webstore_private_api.h index 542596d..048cad4 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.h +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.h @@ -13,10 +13,10 @@ #include "chrome/browser/extensions/webstore_install_helper.h" #include "chrome/browser/extensions/webstore_installer.h" #include "chrome/browser/gpu_feature_checker.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" #include "content/public/browser/gpu_data_manager_observer.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "google_apis/gaia/google_service_auth_error.h" class ProfileSyncService; diff --git a/chrome/browser/extensions/app_notify_channel_setup.cc b/chrome/browser/extensions/app_notify_channel_setup.cc index 2c5a400..19b06b8 100644 --- a/chrome/browser/extensions/app_notify_channel_setup.cc +++ b/chrome/browser/extensions/app_notify_channel_setup.cc @@ -21,10 +21,10 @@ #include "chrome/browser/signin/token_service.h" #include "chrome/browser/signin/token_service_factory.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/net/gaia/gaia_constants.h" -#include "chrome/common/net/gaia/gaia_urls.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/gaia/gaia_constants.h" +#include "google_apis/gaia/gaia_urls.h" #include "net/base/escape.h" #include "net/base/load_flags.h" #include "net/http/http_request_headers.h" diff --git a/chrome/browser/extensions/app_notify_channel_setup.h b/chrome/browser/extensions/app_notify_channel_setup.h index b9974a7..a43e08b 100644 --- a/chrome/browser/extensions/app_notify_channel_setup.h +++ b/chrome/browser/extensions/app_notify_channel_setup.h @@ -11,8 +11,8 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/extensions/app_notify_channel_ui.h" -#include "chrome/common/net/gaia/oauth2_access_token_consumer.h" -#include "chrome/common/net/gaia/oauth2_access_token_fetcher.h" +#include "google_apis/gaia/oauth2_access_token_consumer.h" +#include "google_apis/gaia/oauth2_access_token_fetcher.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_fetcher_delegate.h" diff --git a/chrome/browser/extensions/app_notify_channel_setup_unittest.cc b/chrome/browser/extensions/app_notify_channel_setup_unittest.cc index 43ce39c..bd59663 100644 --- a/chrome/browser/extensions/app_notify_channel_setup_unittest.cc +++ b/chrome/browser/extensions/app_notify_channel_setup_unittest.cc @@ -13,11 +13,11 @@ #include "chrome/browser/signin/token_service_factory.h" #include "chrome/browser/signin/token_service_unittest.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/net/gaia/gaia_urls.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" +#include "google_apis/gaia/gaia_urls.h" #include "googleurl/src/gurl.h" #include "net/url_request/test_url_fetcher_factory.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/extensions/extension_install_prompt.h b/chrome/browser/extensions/extension_install_prompt.h index 9f14c7e..1b65fa6 100644 --- a/chrome/browser/extensions/extension_install_prompt.h +++ b/chrome/browser/extensions/extension_install_prompt.h @@ -14,7 +14,7 @@ #include "chrome/browser/extensions/crx_installer_error.h" #include "chrome/browser/extensions/image_loading_tracker.h" #include "chrome/common/extensions/url_pattern.h" -#include "chrome/common/net/gaia/oauth2_mint_token_flow.h" +#include "google_apis/gaia/oauth2_mint_token_flow.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia.h" diff --git a/chrome/browser/extensions/permissions_updater.cc b/chrome/browser/extensions/permissions_updater.cc index aa06d0a..06e921d 100644 --- a/chrome/browser/extensions/permissions_updater.cc +++ b/chrome/browser/extensions/permissions_updater.cc @@ -14,13 +14,13 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/token_service.h" #include "chrome/browser/signin/token_service_factory.h" -#include "chrome/common/extensions/api/permissions.h" #include "chrome/common/chrome_notification_types.h" +#include "chrome/common/extensions/api/permissions.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" -#include "chrome/common/net/gaia/oauth2_mint_token_flow.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" +#include "google_apis/gaia/oauth2_mint_token_flow.h" using content::RenderProcessHost; using extensions::permissions_api_helpers::PackPermissionSet; diff --git a/chrome/browser/net/gaia/gaia_oauth_fetcher.cc b/chrome/browser/net/gaia/gaia_oauth_fetcher.cc index 5fcdc91..a42aa89 100644 --- a/chrome/browser/net/gaia/gaia_oauth_fetcher.cc +++ b/chrome/browser/net/gaia/gaia_oauth_fetcher.cc @@ -13,11 +13,11 @@ #include "base/string_util.h" #include "base/values.h" #include "chrome/browser/net/gaia/gaia_oauth_consumer.h" -#include "chrome/common/net/gaia/gaia_auth_fetcher.h" -#include "chrome/common/net/gaia/gaia_constants.h" -#include "chrome/common/net/gaia/gaia_urls.h" -#include "chrome/common/net/gaia/oauth_request_signer.h" #include "chrome/common/net/url_util.h" +#include "google_apis/gaia/gaia_auth_fetcher.h" +#include "google_apis/gaia/gaia_constants.h" +#include "google_apis/gaia/gaia_urls.h" +#include "google_apis/gaia/oauth_request_signer.h" #include "grit/chromium_strings.h" #include "net/base/load_flags.h" #include "net/cookies/parsed_cookie.h" diff --git a/chrome/browser/net/gaia/gaia_oauth_fetcher.h b/chrome/browser/net/gaia/gaia_oauth_fetcher.h index 6b2e266..46389ca 100644 --- a/chrome/browser/net/gaia/gaia_oauth_fetcher.h +++ b/chrome/browser/net/gaia/gaia_oauth_fetcher.h @@ -9,7 +9,7 @@ #include <vector> #include "base/memory/scoped_ptr.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_fetcher_delegate.h" diff --git a/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc b/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc index 9fc891b..75e9d29 100644 --- a/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc +++ b/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc @@ -11,10 +11,10 @@ #include "base/message_loop.h" #include "chrome/browser/net/gaia/gaia_oauth_consumer.h" #include "chrome/browser/net/gaia/gaia_oauth_fetcher.h" -#include "chrome/common/net/gaia/gaia_constants.h" -#include "chrome/common/net/gaia/gaia_urls.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/test/base/testing_profile.h" +#include "google_apis/gaia/gaia_constants.h" +#include "google_apis/gaia/gaia_urls.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/http/http_status_code.h" diff --git a/chrome/browser/password_manager/password_manager_delegate_impl.cc b/chrome/browser/password_manager/password_manager_delegate_impl.cc index 229f0bf..6360be4 100644 --- a/chrome/browser/password_manager/password_manager_delegate_impl.cc +++ b/chrome/browser/password_manager/password_manager_delegate_impl.cc @@ -15,11 +15,11 @@ #include "chrome/browser/ui/sync/one_click_signin_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/autofill_messages.h" -#include "chrome/common/net/gaia/gaia_urls.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/ssl_status.h" +#include "google_apis/gaia/gaia_urls.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc index 6453eca..c748796 100644 --- a/chrome/browser/policy/browser_policy_connector.cc +++ b/chrome/browser/policy/browser_policy_connector.cc @@ -28,11 +28,11 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/net/gaia/gaia_auth_util.h" -#include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "google_apis/gaia/gaia_auth_util.h" +#include "google_apis/gaia/gaia_constants.h" #include "grit/generated_resources.h" #include "policy/policy_constants.h" diff --git a/chrome/browser/policy/cloud_policy_validator.cc b/chrome/browser/policy/cloud_policy_validator.cc index c3f168b..bb01094 100644 --- a/chrome/browser/policy/cloud_policy_validator.cc +++ b/chrome/browser/policy/cloud_policy_validator.cc @@ -12,9 +12,9 @@ #include "chrome/browser/policy/proto/chrome_device_policy.pb.h" #include "chrome/browser/policy/proto/cloud_policy.pb.h" #include "chrome/browser/policy/proto/device_management_backend.pb.h" -#include "chrome/common/net/gaia/gaia_auth_util.h" #include "content/public/browser/browser_thread.h" #include "crypto/signature_verifier.h" +#include "google_apis/gaia/gaia_auth_util.h" namespace em = enterprise_management; diff --git a/chrome/browser/policy/device_policy_cache.cc b/chrome/browser/policy/device_policy_cache.cc index 8f6fac2..e0a0cb1 100644 --- a/chrome/browser/policy/device_policy_cache.cc +++ b/chrome/browser/policy/device_policy_cache.cc @@ -23,9 +23,9 @@ #include "chrome/browser/policy/proto/chrome_device_policy.pb.h" #include "chrome/browser/policy/proto/device_management_backend.pb.h" #include "chrome/browser/policy/proto/device_management_local.pb.h" -#include "chrome/common/net/gaia/gaia_auth_util.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/update_engine_client.h" +#include "google_apis/gaia/gaia_auth_util.h" #include "policy/policy_constants.h" #include "third_party/cros_system_api/dbus/service_constants.h" diff --git a/chrome/browser/policy/enterprise_install_attributes.cc b/chrome/browser/policy/enterprise_install_attributes.cc index 277bf90..23fde5a 100644 --- a/chrome/browser/policy/enterprise_install_attributes.cc +++ b/chrome/browser/policy/enterprise_install_attributes.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "chrome/browser/chromeos/cros/cryptohome_library.h" -#include "chrome/common/net/gaia/gaia_auth_util.h" +#include "google_apis/gaia/gaia_auth_util.h" namespace policy { diff --git a/chrome/browser/policy/user_cloud_policy_store_chromeos.cc b/chrome/browser/policy/user_cloud_policy_store_chromeos.cc index 3b5a53c..f92b7da 100644 --- a/chrome/browser/policy/user_cloud_policy_store_chromeos.cc +++ b/chrome/browser/policy/user_cloud_policy_store_chromeos.cc @@ -20,10 +20,10 @@ #include "chrome/browser/policy/user_policy_token_cache.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/net/gaia/gaia_auth_util.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/session_manager_client.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/gaia/gaia_auth_util.h" namespace em = enterprise_management; diff --git a/chrome/browser/policy/user_policy_signin_service.cc b/chrome/browser/policy/user_policy_signin_service.cc index ce91e1d..2001cc8 100644 --- a/chrome/browser/policy/user_policy_signin_service.cc +++ b/chrome/browser/policy/user_policy_signin_service.cc @@ -15,12 +15,12 @@ #include "chrome/browser/signin/token_service.h" #include "chrome/browser/signin/token_service_factory.h" #include "chrome/common/chrome_notification_types.h" -#include "chrome/common/net/gaia/gaia_constants.h" -#include "chrome/common/net/gaia/gaia_urls.h" -#include "chrome/common/net/gaia/oauth2_access_token_fetcher.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "google_apis/gaia/gaia_constants.h" +#include "google_apis/gaia/gaia_urls.h" +#include "google_apis/gaia/oauth2_access_token_fetcher.h" namespace { // TODO(atwilson): Move this once we add OAuth token support to TokenService. diff --git a/chrome/browser/policy/user_policy_signin_service.h b/chrome/browser/policy/user_policy_signin_service.h index 99a6381..0db2a55 100644 --- a/chrome/browser/policy/user_policy_signin_service.h +++ b/chrome/browser/policy/user_policy_signin_service.h @@ -8,9 +8,9 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/profiles/profile_keyed_service.h" -#include "chrome/common/net/gaia/oauth2_access_token_consumer.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "google_apis/gaia/oauth2_access_token_consumer.h" class OAuth2AccessTokenFetcher; class Profile; diff --git a/chrome/browser/policy/user_policy_signin_service_unittest.cc b/chrome/browser/policy/user_policy_signin_service_unittest.cc index be9382f..e21cb6b 100644 --- a/chrome/browser/policy/user_policy_signin_service_unittest.cc +++ b/chrome/browser/policy/user_policy_signin_service_unittest.cc @@ -17,7 +17,6 @@ #include "chrome/browser/signin/token_service.h" #include "chrome/browser/signin/token_service_factory.h" #include "chrome/common/chrome_notification_types.h" -#include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_pref_service.h" @@ -26,6 +25,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "content/public/test/test_browser_thread.h" +#include "google_apis/gaia/gaia_constants.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc index 6802d74..6979f05 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc @@ -22,15 +22,15 @@ #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" -#include "chrome/common/net/gaia/gaia_auth_fetcher.h" -#include "chrome/common/net/gaia/gaia_constants.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/common/pref_names.h" #include "chrome/common/service_messages.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" +#include "google_apis/gaia/gaia_auth_fetcher.h" +#include "google_apis/gaia/gaia_constants.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "grit/chromium_strings.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_font_util.h" diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h index a62f816..203c271 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h @@ -10,9 +10,9 @@ #include "base/memory/weak_ptr.h" #include "base/time.h" -#include "chrome/common/net/gaia/gaia_auth_consumer.h" -#include "chrome/common/net/gaia/gaia_auth_fetcher.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" +#include "google_apis/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/gaia_auth_fetcher.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/native_widget_types.h" diff --git a/chrome/browser/profiles/profile_downloader.cc b/chrome/browser/profiles/profile_downloader.cc index 50a0958..f950990 100644 --- a/chrome/browser/profiles/profile_downloader.cc +++ b/chrome/browser/profiles/profile_downloader.cc @@ -19,15 +19,15 @@ #include "chrome/browser/signin/token_service.h" #include "chrome/browser/signin/token_service_factory.h" #include "chrome/common/chrome_notification_types.h" -#include "chrome/common/net/gaia/gaia_constants.h" -#include "chrome/common/net/gaia/gaia_urls.h" -#include "chrome/common/net/gaia/oauth2_access_token_fetcher.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" +#include "google_apis/gaia/gaia_constants.h" +#include "google_apis/gaia/gaia_urls.h" +#include "google_apis/gaia/oauth2_access_token_fetcher.h" #include "googleurl/src/gurl.h" #include "net/base/load_flags.h" #include "net/url_request/url_fetcher.h" diff --git a/chrome/browser/profiles/profile_downloader.h b/chrome/browser/profiles/profile_downloader.h index 9d6ca65..860a04a 100644 --- a/chrome/browser/profiles/profile_downloader.h +++ b/chrome/browser/profiles/profile_downloader.h @@ -12,9 +12,9 @@ #include "base/memory/scoped_ptr.h" #include "base/string16.h" #include "chrome/browser/image_decoder.h" -#include "chrome/common/net/gaia/oauth2_access_token_consumer.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "google_apis/gaia/oauth2_access_token_consumer.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_fetcher_delegate.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/signin/signin_manager.cc b/chrome/browser/signin/signin_manager.cc index 70f1004..b9d4b33 100644 --- a/chrome/browser/signin/signin_manager.cc +++ b/chrome/browser/signin/signin_manager.cc @@ -20,11 +20,11 @@ #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/net/gaia/gaia_auth_fetcher.h" -#include "chrome/common/net/gaia/gaia_constants.h" -#include "chrome/common/net/gaia/gaia_urls.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" +#include "google_apis/gaia/gaia_auth_fetcher.h" +#include "google_apis/gaia/gaia_constants.h" +#include "google_apis/gaia/gaia_urls.h" #include "net/cookies/cookie_monster.h" #include "unicode/regex.h" diff --git a/chrome/browser/signin/signin_manager.h b/chrome/browser/signin/signin_manager.h index 3f04151..56d31ab 100644 --- a/chrome/browser/signin/signin_manager.h +++ b/chrome/browser/signin/signin_manager.h @@ -25,10 +25,10 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/profiles/profile_keyed_service.h" -#include "chrome/common/net/gaia/gaia_auth_consumer.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "google_apis/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/google_service_auth_error.h" class GaiaAuthFetcher; class Profile; diff --git a/chrome/browser/signin/signin_manager_unittest.cc b/chrome/browser/signin/signin_manager_unittest.cc index 2bea5be..8aca4871 100644 --- a/chrome/browser/signin/signin_manager_unittest.cc +++ b/chrome/browser/signin/signin_manager_unittest.cc @@ -16,12 +16,12 @@ #include "chrome/browser/signin/token_service_unittest.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/chrome_notification_types.h" -#include "chrome/common/net/gaia/gaia_constants.h" -#include "chrome/common/net/gaia/gaia_urls.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_pref_service.h" #include "chrome/test/base/testing_profile.h" +#include "google_apis/gaia/gaia_constants.h" +#include "google_apis/gaia/gaia_urls.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_status.h" diff --git a/chrome/browser/signin/signin_tracker.cc b/chrome/browser/signin/signin_tracker.cc index 0e57884..12a79c3 100644 --- a/chrome/browser/signin/signin_tracker.cc +++ b/chrome/browser/signin/signin_tracker.cc @@ -10,9 +10,9 @@ #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/common/chrome_notification_types.h" -#include "chrome/common/net/gaia/gaia_constants.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "google_apis/gaia/gaia_constants.h" static const char* kSignedInServices[] = { GaiaConstants::kSyncService, diff --git a/chrome/browser/signin/signin_tracker.h b/chrome/browser/signin/signin_tracker.h index d4008ef..7948b94 100644 --- a/chrome/browser/signin/signin_tracker.h +++ b/chrome/browser/signin/signin_tracker.h @@ -6,10 +6,10 @@ #define CHROME_BROWSER_SIGNIN_SIGNIN_TRACKER_H_ #include "chrome/browser/sync/profile_sync_service_observer.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_types.h" +#include "google_apis/gaia/google_service_auth_error.h" class Profile; diff --git a/chrome/browser/signin/signin_tracker_unittest.cc b/chrome/browser/signin/signin_tracker_unittest.cc index a119f96..194fc03 100644 --- a/chrome/browser/signin/signin_tracker_unittest.cc +++ b/chrome/browser/signin/signin_tracker_unittest.cc @@ -14,9 +14,9 @@ #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/common/chrome_notification_types.h" -#include "chrome/common/net/gaia/gaia_constants.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" #include "content/public/browser/notification_service.h" +#include "google_apis/gaia/gaia_constants.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/signin/token_service.cc b/chrome/browser/signin/token_service.cc index 3e4d2f9..a3e4fe9 100644 --- a/chrome/browser/signin/token_service.cc +++ b/chrome/browser/signin/token_service.cc @@ -12,12 +12,12 @@ #include "chrome/browser/webdata/web_data_service_factory.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/net/gaia/gaia_auth_fetcher.h" -#include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" +#include "google_apis/gaia/gaia_auth_fetcher.h" +#include "google_apis/gaia/gaia_constants.h" #include "net/url_request/url_request_context_getter.h" using content::BrowserThread; diff --git a/chrome/browser/signin/token_service.h b/chrome/browser/signin/token_service.h index 084b753..d7a2175 100644 --- a/chrome/browser/signin/token_service.h +++ b/chrome/browser/signin/token_service.h @@ -52,11 +52,11 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/profiles/profile_keyed_service.h" #include "chrome/browser/webdata/web_data_service.h" -#include "chrome/common/net/gaia/gaia_auth_consumer.h" -#include "chrome/common/net/gaia/gaia_auth_fetcher.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "google_apis/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/gaia_auth_fetcher.h" +#include "google_apis/gaia/google_service_auth_error.h" class Profile; class TokenServiceTest; diff --git a/chrome/browser/signin/token_service_unittest.cc b/chrome/browser/signin/token_service_unittest.cc index 72e3528..69ab315 100644 --- a/chrome/browser/signin/token_service_unittest.cc +++ b/chrome/browser/signin/token_service_unittest.cc @@ -16,8 +16,8 @@ #include "chrome/browser/webdata/web_data_service_factory.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/net/gaia/gaia_constants.h" -#include "chrome/common/net/gaia/mock_url_fetcher_factory.h" +#include "google_apis/gaia/gaia_constants.h" +#include "google_apis/gaia/mock_url_fetcher_factory.h" #include "net/url_request/test_url_fetcher_factory.h" using content::BrowserThread; diff --git a/chrome/browser/signin/token_service_unittest.h b/chrome/browser/signin/token_service_unittest.h index 97ed5a1..e4ec1b7 100644 --- a/chrome/browser/signin/token_service_unittest.h +++ b/chrome/browser/signin/token_service_unittest.h @@ -9,14 +9,14 @@ #include "base/message_loop.h" #include "base/synchronization/waitable_event.h" -#include "chrome/browser/webdata/web_data_service.h" #include "chrome/browser/signin/token_service.h" -#include "chrome/common/net/gaia/gaia_auth_consumer.h" +#include "chrome/browser/webdata/web_data_service.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/test/test_browser_thread.h" #include "content/public/test/test_notification_tracker.h" +#include "google_apis/gaia/gaia_auth_consumer.h" #include "testing/gtest/include/gtest/gtest.h" // TestNotificationTracker doesn't do a deep copy on the notification details. diff --git a/chrome/browser/signin/ubertoken_fetcher.cc b/chrome/browser/signin/ubertoken_fetcher.cc index 6b30e07..43bf816 100644 --- a/chrome/browser/signin/ubertoken_fetcher.cc +++ b/chrome/browser/signin/ubertoken_fetcher.cc @@ -9,9 +9,9 @@ #include "chrome/browser/signin/token_service_factory.h" #include "chrome/browser/signin/ubertoken_fetcher.h" #include "chrome/common/chrome_notification_types.h" -#include "chrome/common/net/gaia/gaia_constants.h" -#include "chrome/common/net/gaia/gaia_urls.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" +#include "google_apis/gaia/gaia_constants.h" +#include "google_apis/gaia/gaia_urls.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "net/base/load_flags.h" UbertokenFetcher::UbertokenFetcher(Profile* profile, diff --git a/chrome/browser/signin/ubertoken_fetcher.h b/chrome/browser/signin/ubertoken_fetcher.h index c6ad477..3c4a516 100644 --- a/chrome/browser/signin/ubertoken_fetcher.h +++ b/chrome/browser/signin/ubertoken_fetcher.h @@ -6,13 +6,13 @@ #define CHROME_BROWSER_SIGNIN_UBERTOKEN_FETCHER_H_ #include "base/memory/scoped_ptr.h" -#include "chrome/common/net/gaia/gaia_auth_consumer.h" -#include "chrome/common/net/gaia/gaia_auth_fetcher.h" -#include "chrome/common/net/gaia/gaia_oauth_client.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" +#include "google_apis/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/gaia_auth_fetcher.h" +#include "google_apis/gaia/gaia_oauth_client.h" // Allow to retrieves an uber-auth token for the user. This class uses the // |TokenService| and considers that the user is already logged in. It will then diff --git a/chrome/browser/signin/ubertoken_fetcher_unittest.cc b/chrome/browser/signin/ubertoken_fetcher_unittest.cc index f830451..34f8402 100644 --- a/chrome/browser/signin/ubertoken_fetcher_unittest.cc +++ b/chrome/browser/signin/ubertoken_fetcher_unittest.cc @@ -7,7 +7,7 @@ #include "chrome/browser/signin/token_service.h" #include "chrome/browser/signin/token_service_unittest.h" #include "chrome/common/chrome_notification_types.h" -#include "chrome/common/net/gaia/gaia_constants.h" +#include "google_apis/gaia/gaia_constants.h" #include "net/url_request/test_url_fetcher_factory.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/credential_cache_service_win.cc b/chrome/browser/sync/credential_cache_service_win.cc index b6e5be8..23ac826 100644 --- a/chrome/browser/sync/credential_cache_service_win.cc +++ b/chrome/browser/sync/credential_cache_service_win.cc @@ -4,9 +4,9 @@ #include "chrome/browser/sync/credential_cache_service_win.h" +#include "base/base64.h" #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/base64.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/file_util.h" @@ -29,12 +29,12 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths_internal.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/net/gaia/gaia_auth_consumer.h" -#include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "google_apis/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/gaia_constants.h" #include "sync/internal_api/public/base/model_type.h" namespace syncer { diff --git a/chrome/browser/sync/credential_cache_service_win_unittest.cc b/chrome/browser/sync/credential_cache_service_win_unittest.cc index 3264d05..60b7ab7 100644 --- a/chrome/browser/sync/credential_cache_service_win_unittest.cc +++ b/chrome/browser/sync/credential_cache_service_win_unittest.cc @@ -12,8 +12,8 @@ #include "base/values.h" #include "chrome/browser/sync/credential_cache_service_win.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/common/pref_names.h" +#include "google_apis/gaia/gaia_constants.h" #include "testing/gtest/include/gtest/gtest.h" namespace syncer { diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc index b842272..cae3a90 100644 --- a/chrome/browser/sync/glue/sync_backend_host.cc +++ b/chrome/browser/sync/glue/sync_backend_host.cc @@ -33,10 +33,10 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/net/gaia/gaia_constants.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/common/content_client.h" +#include "google_apis/gaia/gaia_constants.h" #include "jingle/notifier/base/notification_method.h" #include "jingle/notifier/base/notifier_options.h" #include "net/base/host_port_pair.h" diff --git a/chrome/browser/sync/glue/sync_backend_host.h b/chrome/browser/sync/glue/sync_backend_host.h index 1d66381..872af93 100644 --- a/chrome/browser/sync/glue/sync_backend_host.h +++ b/chrome/browser/sync/glue/sync_backend_host.h @@ -16,7 +16,7 @@ #include "base/threading/thread.h" #include "chrome/browser/sync/glue/backend_data_type_configurer.h" #include "chrome/browser/sync/glue/chrome_extensions_activity_monitor.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "googleurl/src/gurl.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/configure_reason.h" diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index 3f0b87d..2b47345 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -49,12 +49,12 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" +#include "google_apis/gaia/gaia_constants.h" #include "grit/generated_resources.h" #include "net/cookies/cookie_monster.h" #include "sync/api/sync_error.h" diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h index a09766b..e6c8439 100644 --- a/chrome/browser/sync/profile_sync_service.h +++ b/chrome/browser/sync/profile_sync_service.h @@ -29,10 +29,10 @@ #include "chrome/browser/sync/invalidations/invalidator_storage.h" #include "chrome/browser/sync/profile_sync_service_observer.h" #include "chrome/browser/sync/sync_prefs.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_types.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "googleurl/src/gurl.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/engine/model_safe_worker.h" diff --git a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc index 43c76a7..031fbb7 100644 --- a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc @@ -45,9 +45,9 @@ #include "chrome/browser/webdata/web_data_service_factory.h" #include "chrome/browser/webdata/web_database.h" #include "chrome/common/chrome_notification_types.h" -#include "chrome/common/net/gaia/gaia_constants.h" #include "content/public/browser/notification_source.h" #include "content/public/test/test_browser_thread.h" +#include "google_apis/gaia/gaia_constants.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/read_node.h" #include "sync/internal_api/public/read_transaction.h" diff --git a/chrome/browser/sync/profile_sync_service_mock.h b/chrome/browser/sync/profile_sync_service_mock.h index 8ae04e3..795be58 100644 --- a/chrome/browser/sync/profile_sync_service_mock.h +++ b/chrome/browser/sync/profile_sync_service_mock.h @@ -12,8 +12,8 @@ #include "chrome/browser/sync/glue/change_processor.h" #include "chrome/browser/sync/glue/data_type_controller.h" #include "chrome/browser/sync/profile_sync_service.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/test/base/testing_profile.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/protocol/sync_protocol_error.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/sync/profile_sync_service_password_unittest.cc b/chrome/browser/sync/profile_sync_service_password_unittest.cc index 1dfbb51..8ee1304 100644 --- a/chrome/browser/sync/profile_sync_service_password_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_password_unittest.cc @@ -29,12 +29,12 @@ #include "chrome/browser/sync/profile_sync_test_util.h" #include "chrome/browser/sync/test_profile_sync_service.h" #include "chrome/common/chrome_notification_types.h" -#include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/profile_mock.h" #include "content/public/browser/notification_source.h" #include "content/public/test/mock_notification_observer.h" #include "content/public/test/test_browser_thread.h" +#include "google_apis/gaia/gaia_constants.h" #include "sync/internal_api/public/read_node.h" #include "sync/internal_api/public/read_transaction.h" #include "sync/internal_api/public/write_node.h" diff --git a/chrome/browser/sync/profile_sync_service_preference_unittest.cc b/chrome/browser/sync/profile_sync_service_preference_unittest.cc index a5db283..9f42ad1 100644 --- a/chrome/browser/sync/profile_sync_service_preference_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_preference_unittest.cc @@ -24,10 +24,10 @@ #include "chrome/browser/sync/glue/ui_data_type_controller.h" #include "chrome/browser/sync/profile_sync_test_util.h" #include "chrome/browser/sync/test_profile_sync_service.h" -#include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service.h" #include "chrome/test/base/testing_profile.h" +#include "google_apis/gaia/gaia_constants.h" #include "sync/api/sync_data.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/change_record.h" diff --git a/chrome/browser/sync/profile_sync_service_session_unittest.cc b/chrome/browser/sync/profile_sync_service_session_unittest.cc index 284ad45..33790cf 100644 --- a/chrome/browser/sync/profile_sync_service_session_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_session_unittest.cc @@ -28,7 +28,6 @@ #include "chrome/browser/sync/profile_sync_test_util.h" #include "chrome/browser/sync/test_profile_sync_service.h" #include "chrome/common/chrome_notification_types.h" -#include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/navigation_entry.h" @@ -36,6 +35,7 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_browser_thread.h" +#include "google_apis/gaia/gaia_constants.h" #include "googleurl/src/gurl.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/change_record.h" diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc b/chrome/browser/sync/profile_sync_service_startup_unittest.cc index ff89926..d4f2b07 100644 --- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc @@ -18,11 +18,11 @@ #include "chrome/browser/sync/profile_sync_test_util.h" #include "chrome/browser/sync/test_profile_sync_service.h" #include "chrome/common/chrome_notification_types.h" -#include "chrome/common/net/gaia/gaia_auth_consumer.h" -#include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" +#include "google_apis/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/gaia_constants.h" #include "testing/gmock/include/gmock/gmock.h" using browser_sync::DataTypeManager; diff --git a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc index 74fc84d..1a8bd06 100644 --- a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc @@ -36,10 +36,10 @@ #include "chrome/browser/sync/profile_sync_test_util.h" #include "chrome/browser/sync/test_profile_sync_service.h" #include "chrome/common/chrome_notification_types.h" -#include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/test/base/profile_mock.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/notification_service.h" +#include "google_apis/gaia/gaia_constants.h" #include "googleurl/src/gurl.h" #include "sync/internal_api/public/read_node.h" #include "sync/internal_api/public/read_transaction.h" diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc index 53dba54..1671d52 100644 --- a/chrome/browser/sync/profile_sync_service_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_unittest.cc @@ -15,13 +15,13 @@ #include "chrome/browser/sync/profile_sync_components_factory_mock.h" #include "chrome/browser/sync/test_profile_sync_service.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service.h" #include "chrome/test/base/testing_profile.h" #include "content/public/common/content_client.h" #include "content/public/test/test_browser_thread.h" #include "google/cacheinvalidation/include/types.h" +#include "google_apis/gaia/gaia_constants.h" #include "sync/js/js_arg_list.h" #include "sync/js/js_event_details.h" #include "sync/js/js_test_util.h" diff --git a/chrome/browser/sync/sync_global_error.cc b/chrome/browser/sync/sync_global_error.cc index 3c2d77d..7c4f143 100644 --- a/chrome/browser/sync/sync_global_error.cc +++ b/chrome/browser/sync/sync_global_error.cc @@ -14,7 +14,7 @@ #include "chrome/browser/ui/global_error/global_error_service_factory.h" #include "chrome/browser/ui/webui/signin/login_ui_service.h" #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc index aec86c6..b7f53223 100644 --- a/chrome/browser/sync/sync_ui_util.cc +++ b/chrome/browser/sync/sync_ui_util.cc @@ -19,9 +19,9 @@ #include "chrome/browser/ui/webui/signin/login_ui_service.h" #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/sync/test/integration/sync_errors_test.cc b/chrome/browser/sync/test/integration/sync_errors_test.cc index 2a91517..9dde47d 100644 --- a/chrome/browser/sync/test/integration/sync_errors_test.cc +++ b/chrome/browser/sync/test/integration/sync_errors_test.cc @@ -9,8 +9,8 @@ #include "chrome/browser/sync/test/integration/bookmarks_helper.h" #include "chrome/browser/sync/test/integration/passwords_helper.h" #include "chrome/browser/sync/test/integration/sync_test.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/common/pref_names.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "sync/protocol/sync_protocol_error.h" using bookmarks_helper::AddFolder; diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc index 1dd0125..422588c 100644 --- a/chrome/browser/sync/test/integration/sync_test.cc +++ b/chrome/browser/sync/test/integration/sync_test.cc @@ -35,11 +35,11 @@ #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/net/gaia/gaia_urls.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/test_browser_thread.h" +#include "google_apis/gaia/gaia_urls.h" #include "googleurl/src/gurl.h" #include "net/base/escape.h" #include "net/base/load_flags.h" @@ -54,9 +54,9 @@ #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_status.h" +#include "sync/engine/sync_scheduler_impl.h" #include "sync/notifier/p2p_invalidator.h" #include "sync/protocol/sync.pb.h" -#include "sync/engine/sync_scheduler_impl.h" using content::BrowserThread; diff --git a/chrome/browser/ui/auto_login_info_bar_delegate.cc b/chrome/browser/ui/auto_login_info_bar_delegate.cc index bf9cb1e..8858b2b 100644 --- a/chrome/browser/ui/auto_login_info_bar_delegate.cc +++ b/chrome/browser/ui/auto_login_info_bar_delegate.cc @@ -20,8 +20,6 @@ #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/net/gaia/gaia_constants.h" -#include "chrome/common/net/gaia/gaia_urls.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/public/browser/navigation_controller.h" @@ -33,6 +31,8 @@ #include "content/public/browser/page_navigator.h" #include "content/public/browser/web_contents.h" #include "content/public/common/referrer.h" +#include "google_apis/gaia/gaia_constants.h" +#include "google_apis/gaia/gaia_urls.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc index 15d0e03..7290c68 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc @@ -46,7 +46,6 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/jstemplate_builder.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" @@ -58,6 +57,7 @@ #include "content/public/browser/web_ui_message_handler.h" #include "content/public/common/content_client.h" #include "content/public/common/process_type.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "googleurl/src/gurl.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc index 9a6fc33c..bae3587 100644 --- a/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc @@ -17,12 +17,12 @@ #include "chrome/browser/policy/auto_enrollment_client.h" #include "chrome/browser/policy/enterprise_metrics.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/net/gaia/gaia_auth_util.h" -#include "chrome/common/net/gaia/gaia_constants.h" -#include "chrome/common/net/gaia/gaia_switches.h" -#include "chrome/common/net/gaia/gaia_urls.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" #include "content/public/browser/web_contents.h" +#include "google_apis/gaia/gaia_auth_util.h" +#include "google_apis/gaia/gaia_constants.h" +#include "google_apis/gaia/gaia_switches.h" +#include "google_apis/gaia/gaia_urls.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc index 4ca6d5f..807c828 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc @@ -32,9 +32,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/net/gaia/gaia_auth_util.h" -#include "chrome/common/net/gaia/gaia_switches.h" -#include "chrome/common/net/gaia/gaia_urls.h" #include "chrome/common/url_constants.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/power_manager_client.h" @@ -43,6 +40,9 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" +#include "google_apis/gaia/gaia_auth_util.h" +#include "google_apis/gaia/gaia_switches.h" +#include "google_apis/gaia/gaia_urls.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index efa973d..3285d5c 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -54,7 +54,6 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" @@ -68,6 +67,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/common/page_zoom.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc index 40bd558..e924ef7 100644 --- a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc @@ -19,8 +19,8 @@ #include "chrome/browser/policy/browser_policy_connector.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/ui/webui/chromeos/ui_account_tweaks.h" -#include "chrome/common/net/gaia/gaia_auth_util.h" #include "content/public/browser/web_ui.h" +#include "google_apis/gaia/gaia_auth_util.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc index fdbec36..794cf10 100644 --- a/chrome/browser/ui/webui/sync_setup_handler.cc +++ b/chrome/browser/ui/webui/sync_setup_handler.cc @@ -28,11 +28,11 @@ #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/common/url_constants.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" +#include "google_apis/gaia/gaia_constants.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index bc9b339..f58575b 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -282,6 +282,7 @@ 'common', 'common_net', '../base/base.gyp:base', + '../google_apis/google_apis.gyp:google_apis', '../jingle/jingle.gyp:notifier', '../net/net.gyp:net', '../printing/printing.gyp:printing', diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index d3e5be2..25592a0 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -35,6 +35,7 @@ '../content/content.gyp:content_browser', '../content/content.gyp:content_common', '../crypto/crypto.gyp:crypto', + '../google_apis/google_apis.gyp:google_apis', '../media/media.gyp:media', '../net/net.gyp:net_with_v8', '../ppapi/ppapi_internal.gyp:ppapi_ipc', # For PpapiMsg_LoadPlugin diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 5cd84eb..b6e16bc 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -441,39 +441,6 @@ 'target_name': 'common_net', 'type': 'static_library', 'sources': [ - 'common/net/gaia/gaia_auth_consumer.cc', - 'common/net/gaia/gaia_auth_consumer.h', - 'common/net/gaia/gaia_auth_fetcher.cc', - 'common/net/gaia/gaia_auth_fetcher.h', - 'common/net/gaia/gaia_auth_util.cc', - 'common/net/gaia/gaia_auth_util.h', - 'common/net/gaia/gaia_authenticator.cc', - 'common/net/gaia/gaia_authenticator.h', - 'common/net/gaia/gaia_oauth_client.cc', - 'common/net/gaia/gaia_oauth_client.h', - 'common/net/gaia/gaia_switches.cc', - 'common/net/gaia/gaia_switches.h', - 'common/net/gaia/gaia_urls.cc', - 'common/net/gaia/gaia_urls.h', - 'common/net/gaia/google_service_auth_error.cc', - 'common/net/gaia/google_service_auth_error.h', - 'common/net/gaia/oauth_request_signer.cc', - 'common/net/gaia/oauth_request_signer.h', - 'common/net/gaia/oauth2_access_token_consumer.h', - 'common/net/gaia/oauth2_access_token_fetcher.cc', - 'common/net/gaia/oauth2_access_token_fetcher.h', - 'common/net/gaia/oauth2_api_call_flow.cc', - 'common/net/gaia/oauth2_api_call_flow.h', - 'common/net/gaia/oauth2_mint_token_consumer.h', - 'common/net/gaia/oauth2_mint_token_fetcher.cc', - 'common/net/gaia/oauth2_mint_token_fetcher.h', - 'common/net/gaia/oauth2_mint_token_flow.cc', - 'common/net/gaia/oauth2_mint_token_flow.h', - 'common/net/gaia/oauth2_revocation_consumer.h', - 'common/net/gaia/oauth2_revocation_fetcher.cc', - 'common/net/gaia/oauth2_revocation_fetcher.h', - 'common/net/google_apis/google_api_keys.cc', - 'common/net/google_apis/google_api_keys.h', 'common/net/net_resource_provider.cc', 'common/net/net_resource_provider.h', 'common/net/predictor_common.h', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 64f443f..39be406 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -197,7 +197,6 @@ 'common/extensions/extension_builder.h', 'common/extensions/value_builder.cc', 'common/extensions/value_builder.h', - 'common/net/gaia/mock_url_fetcher_factory.h', 'common/pref_store_observer_mock.cc', 'common/pref_store_observer_mock.h', 'renderer/chrome_mock_render_thread.cc', @@ -983,6 +982,9 @@ 'common/extensions/api/api.gyp:api', 'chrome_resources.gyp:chrome_resources', 'chrome_resources.gyp:chrome_strings', + # TODO(joi): Move these to their own unittest executable? + '../google_apis/google_apis.gyp:google_apis', + '../google_apis/google_apis.gyp:google_apis_unittests', ], 'include_dirs': [ '..', @@ -2035,17 +2037,6 @@ 'common/metrics/variations/variations_util_unittest.cc', 'common/multi_process_lock_unittest.cc', 'common/net/url_util_unittest.cc', - 'common/net/gaia/gaia_auth_fetcher_unittest.cc', - 'common/net/gaia/gaia_auth_util_unittest.cc', - 'common/net/gaia/gaia_authenticator_unittest.cc', - 'common/net/gaia/gaia_oauth_client_unittest.cc', - 'common/net/gaia/google_service_auth_error_unittest.cc', - 'common/net/gaia/oauth_request_signer_unittest.cc', - 'common/net/gaia/oauth2_access_token_fetcher_unittest.cc', - 'common/net/gaia/oauth2_api_call_flow_unittest.cc', - 'common/net/gaia/oauth2_mint_token_fetcher_unittest.cc', - 'common/net/gaia/oauth2_mint_token_flow_unittest.cc', - 'common/net/gaia/oauth2_revocation_fetcher_unittest.cc', 'common/net/x509_certificate_model_unittest.cc', 'common/service_process_util_unittest.cc', 'common/string_ordinal_unittest.cc', diff --git a/chrome/common/net/gaia/DEPS b/chrome/common/net/gaia/DEPS deleted file mode 100644 index 4969fe5..0000000 --- a/chrome/common/net/gaia/DEPS +++ /dev/null @@ -1,13 +0,0 @@ -include_rules = [ - "-chrome", - "-content", - "+chrome/common/net/gaia", - "+chrome/common/net/google_apis", -] - -specific_include_rules = { - ".*_[a-z]*test\.cc": [ - "+chrome/test", - "+content/public/test", - ] -} diff --git a/chrome/common_constants.gypi b/chrome/common_constants.gypi index 4762e1e..a2a93e0 100644 --- a/chrome/common_constants.gypi +++ b/chrome/common_constants.gypi @@ -23,8 +23,6 @@ 'common/chrome_switches.h', 'common/env_vars.cc', 'common/env_vars.h', - 'common/net/gaia/gaia_constants.cc', - 'common/net/gaia/gaia_constants.h', 'common/net/test_server_locations.cc', 'common/net/test_server_locations.h', 'common/pref_names.cc', diff --git a/chrome/renderer/autofill/DEPS b/chrome/renderer/autofill/DEPS new file mode 100644 index 0000000..2e4187f --- /dev/null +++ b/chrome/renderer/autofill/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + "!google_apis/gaia/gaia_urls.h", +] diff --git a/chrome/renderer/autofill/password_generation_manager.cc b/chrome/renderer/autofill/password_generation_manager.cc index ef14059..11bd0b5 100644 --- a/chrome/renderer/autofill/password_generation_manager.cc +++ b/chrome/renderer/autofill/password_generation_manager.cc @@ -6,18 +6,18 @@ #include "base/logging.h" #include "chrome/common/autofill_messages.h" -#include "chrome/common/net/gaia/gaia_urls.h" #include "chrome/common/password_generation_util.h" #include "content/public/renderer/render_view.h" +#include "google_apis/gaia/gaia_urls.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" #include "ui/gfx/rect.h" namespace autofill { diff --git a/chrome/service/DEPS b/chrome/service/DEPS index c1b9790..bad5500 100644 --- a/chrome/service/DEPS +++ b/chrome/service/DEPS @@ -1,4 +1,5 @@ include_rules = [ + "+google_apis", # For generated headers. "+grit", "+sandbox/win/src/sandbox_types.h", diff --git a/chrome/service/cloud_print/cloud_print_auth.cc b/chrome/service/cloud_print/cloud_print_auth.cc index 8bbfd0f..8ecdd63 100644 --- a/chrome/service/cloud_print/cloud_print_auth.cc +++ b/chrome/service/cloud_print/cloud_print_auth.cc @@ -6,13 +6,13 @@ #include "base/bind.h" #include "base/string_util.h" -#include "chrome/common/net/gaia/gaia_urls.h" #include "chrome/service/cloud_print/cloud_print_consts.h" #include "chrome/service/cloud_print/cloud_print_helpers.h" #include "chrome/service/cloud_print/cloud_print_token_store.h" #include "chrome/service/gaia/service_gaia_authenticator.h" #include "chrome/service/net/service_url_request_context.h" #include "chrome/service/service_process.h" +#include "google_apis/gaia/gaia_urls.h" CloudPrintAuth::CloudPrintAuth( Client* client, diff --git a/chrome/service/cloud_print/cloud_print_auth.h b/chrome/service/cloud_print/cloud_print_auth.h index a6fc438..1efd778 100644 --- a/chrome/service/cloud_print/cloud_print_auth.h +++ b/chrome/service/cloud_print/cloud_print_auth.h @@ -8,8 +8,8 @@ #include <string> #include "base/values.h" -#include "chrome/common/net/gaia/gaia_oauth_client.h" #include "chrome/service/cloud_print/cloud_print_url_fetcher.h" +#include "google_apis/gaia/gaia_oauth_client.h" #include "googleurl/src/gurl.h" // CloudPrintAuth is a class to handle login, token refresh, and other diff --git a/chrome/service/cloud_print/cloud_print_proxy.cc b/chrome/service/cloud_print/cloud_print_proxy.cc index 581103a..52c938b 100644 --- a/chrome/service/cloud_print/cloud_print_proxy.cc +++ b/chrome/service/cloud_print/cloud_print_proxy.cc @@ -11,13 +11,13 @@ #include "base/values.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/cloud_print/cloud_print_proxy_info.h" -#include "chrome/common/net/gaia/gaia_oauth_client.h" -#include "chrome/common/net/google_apis/google_api_keys.h" #include "chrome/common/pref_names.h" #include "chrome/service/cloud_print/cloud_print_consts.h" #include "chrome/service/cloud_print/print_system.h" #include "chrome/service/service_process.h" #include "chrome/service/service_process_prefs.h" +#include "google_apis/gaia/gaia_oauth_client.h" +#include "google_apis/google_api_keys.h" #include "googleurl/src/gurl.h" namespace { diff --git a/chrome/service/cloud_print/cloud_print_proxy_backend.cc b/chrome/service/cloud_print/cloud_print_proxy_backend.cc index 78a386f..6e6a19b 100644 --- a/chrome/service/cloud_print/cloud_print_proxy_backend.cc +++ b/chrome/service/cloud_print/cloud_print_proxy_backend.cc @@ -12,8 +12,6 @@ #include "base/file_util.h" #include "base/rand_util.h" #include "base/values.h" -#include "chrome/common/net/gaia/gaia_oauth_client.h" -#include "chrome/common/net/gaia/gaia_urls.h" #include "chrome/service/cloud_print/cloud_print_auth.h" #include "chrome/service/cloud_print/cloud_print_connector.h" #include "chrome/service/cloud_print/cloud_print_consts.h" @@ -22,6 +20,8 @@ #include "chrome/service/gaia/service_gaia_authenticator.h" #include "chrome/service/net/service_url_request_context.h" #include "chrome/service/service_process.h" +#include "google_apis/gaia/gaia_oauth_client.h" +#include "google_apis/gaia/gaia_urls.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "jingle/notifier/base/notifier_options.h" diff --git a/chrome/service/gaia/service_gaia_authenticator.h b/chrome/service/gaia/service_gaia_authenticator.h index a4fef82..ffde6d3 100644 --- a/chrome/service/gaia/service_gaia_authenticator.h +++ b/chrome/service/gaia/service_gaia_authenticator.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "base/synchronization/waitable_event.h" -#include "chrome/common/net/gaia/gaia_authenticator.h" +#include "google_apis/gaia/gaia_authenticator.h" #include "net/url_request/url_fetcher_delegate.h" namespace base { diff --git a/chrome/common/net/google_apis/DEPS b/google_apis/DEPS index a3fc565..367bfb8 100644 --- a/chrome/common/net/google_apis/DEPS +++ b/google_apis/DEPS @@ -1,5 +1,6 @@ include_rules = [ "-chrome", "-content", - "+chrome/common/net/google_apis", + "+crypto", + "+net", ] diff --git a/google_apis/OWNERS b/google_apis/OWNERS new file mode 100644 index 0000000..dd0c213 --- /dev/null +++ b/google_apis/OWNERS @@ -0,0 +1,4 @@ +set noparent + +ben@chromium.org +joi@chromium.org diff --git a/google_apis/gaia/DEPS b/google_apis/gaia/DEPS new file mode 100644 index 0000000..6fb8e99 --- /dev/null +++ b/google_apis/gaia/DEPS @@ -0,0 +1,6 @@ +specific_include_rules = { + ".*_[a-z]*test\.cc": [ + "+chrome/test/base/testing_profile.h", + "+content/public/test/test_browser_thread.h", + ] +} diff --git a/google_apis/gaia/OWNERS b/google_apis/gaia/OWNERS new file mode 100644 index 0000000..654a183 --- /dev/null +++ b/google_apis/gaia/OWNERS @@ -0,0 +1,3 @@ +rogerta@chromium.org +tim@chromium.org +zelidrag@chromium.org diff --git a/chrome/common/net/gaia/gaia_auth_consumer.cc b/google_apis/gaia/gaia_auth_consumer.cc index 6b14655..d461bf8 100644 --- a/chrome/common/net/gaia/gaia_auth_consumer.cc +++ b/google_apis/gaia/gaia_auth_consumer.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/common/net/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/gaia_auth_consumer.h" GaiaAuthConsumer::ClientLoginResult::ClientLoginResult() : two_factor(false) { diff --git a/chrome/common/net/gaia/gaia_auth_consumer.h b/google_apis/gaia/gaia_auth_consumer.h index 03c8454..aa84439 100644 --- a/chrome/common/net/gaia/gaia_auth_consumer.h +++ b/google_apis/gaia/gaia_auth_consumer.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_COMMON_NET_GAIA_GAIA_AUTH_CONSUMER_H_ -#define CHROME_COMMON_NET_GAIA_GAIA_AUTH_CONSUMER_H_ +#ifndef GOOGLE_APIS_GAIA_GAIA_AUTH_CONSUMER_H_ +#define GOOGLE_APIS_GAIA_GAIA_AUTH_CONSUMER_H_ -#include <string> #include <map> +#include <string> #include <vector> class GoogleServiceAuthError; @@ -82,4 +82,4 @@ class GaiaAuthConsumer { virtual void OnMergeSessionFailure(const GoogleServiceAuthError& error) {} }; -#endif // CHROME_COMMON_NET_GAIA_GAIA_AUTH_CONSUMER_H_ +#endif // GOOGLE_APIS_GAIA_GAIA_AUTH_CONSUMER_H_ diff --git a/chrome/common/net/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_fetcher.cc index 7caa925..803ad6f 100644 --- a/chrome/common/net/gaia/gaia_auth_fetcher.cc +++ b/google_apis/gaia/gaia_auth_fetcher.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/common/net/gaia/gaia_auth_fetcher.h" +#include "google_apis/gaia/gaia_auth_fetcher.h" #include <algorithm> #include <string> @@ -15,10 +15,10 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/values.h" -#include "chrome/common/net/gaia/gaia_auth_consumer.h" -#include "chrome/common/net/gaia/gaia_constants.h" -#include "chrome/common/net/gaia/gaia_urls.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" +#include "google_apis/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/gaia_constants.h" +#include "google_apis/gaia/gaia_urls.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "net/base/escape.h" #include "net/base/load_flags.h" #include "net/http/http_status_code.h" diff --git a/chrome/common/net/gaia/gaia_auth_fetcher.h b/google_apis/gaia/gaia_auth_fetcher.h index 718d828..2aea05b 100644 --- a/chrome/common/net/gaia/gaia_auth_fetcher.h +++ b/google_apis/gaia/gaia_auth_fetcher.h @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_COMMON_NET_GAIA_GAIA_AUTH_FETCHER_H_ -#define CHROME_COMMON_NET_GAIA_GAIA_AUTH_FETCHER_H_ +#ifndef GOOGLE_APIS_GAIA_GAIA_AUTH_FETCHER_H_ +#define GOOGLE_APIS_GAIA_GAIA_AUTH_FETCHER_H_ #include <string> #include <vector> #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" -#include "chrome/common/net/gaia/gaia_auth_consumer.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" +#include "google_apis/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_fetcher_delegate.h" @@ -403,4 +403,4 @@ class GaiaAuthFetcher : public net::URLFetcherDelegate { DISALLOW_COPY_AND_ASSIGN(GaiaAuthFetcher); }; -#endif // CHROME_COMMON_NET_GAIA_GAIA_AUTH_FETCHER_H_ +#endif // GOOGLE_APIS_GAIA_GAIA_AUTH_FETCHER_H_ diff --git a/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc b/google_apis/gaia/gaia_auth_fetcher_unittest.cc index 2229057..cfa617d 100644 --- a/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc +++ b/google_apis/gaia/gaia_auth_fetcher_unittest.cc @@ -11,12 +11,12 @@ #include "base/message_loop.h" #include "base/stringprintf.h" #include "base/values.h" -#include "chrome/common/net/gaia/gaia_auth_consumer.h" -#include "chrome/common/net/gaia/gaia_auth_fetcher.h" -#include "chrome/common/net/gaia/gaia_urls.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" -#include "chrome/common/net/gaia/mock_url_fetcher_factory.h" #include "chrome/test/base/testing_profile.h" +#include "google_apis/gaia/gaia_auth_consumer.h" +#include "google_apis/gaia/gaia_auth_fetcher.h" +#include "google_apis/gaia/gaia_urls.h" +#include "google_apis/gaia/google_service_auth_error.h" +#include "google_apis/gaia/mock_url_fetcher_factory.h" #include "googleurl/src/gurl.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" @@ -89,7 +89,7 @@ MockFetcher::MockFetcher(bool success, : TestURLFetcher(0, url, d) { set_url(url); net::URLRequestStatus::Status code; - + if (success) { set_response_code(net::HTTP_OK); code = net::URLRequestStatus::SUCCESS; diff --git a/chrome/common/net/gaia/gaia_auth_util.cc b/google_apis/gaia/gaia_auth_util.cc index ec9f421..d8cac90 100644 --- a/chrome/common/net/gaia/gaia_auth_util.cc +++ b/google_apis/gaia/gaia_auth_util.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/common/net/gaia/gaia_auth_util.h" +#include "google_apis/gaia/gaia_auth_util.h" #include <vector> diff --git a/chrome/common/net/gaia/gaia_auth_util.h b/google_apis/gaia/gaia_auth_util.h index c93b593..792a59b 100644 --- a/chrome/common/net/gaia/gaia_auth_util.h +++ b/google_apis/gaia/gaia_auth_util.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_COMMON_NET_GAIA_GAIA_AUTH_UTIL_H_ -#define CHROME_COMMON_NET_GAIA_GAIA_AUTH_UTIL_H_ +#ifndef GOOGLE_APIS_GAIA_GAIA_AUTH_UTIL_H_ +#define GOOGLE_APIS_GAIA_GAIA_AUTH_UTIL_H_ #include <string> @@ -28,4 +28,4 @@ std::string ExtractDomainName(const std::string& email); } // namespace gaia -#endif // CHROME_COMMON_NET_GAIA_GAIA_AUTH_UTIL_H_ +#endif // GOOGLE_APIS_GAIA_GAIA_AUTH_UTIL_H_ diff --git a/chrome/common/net/gaia/gaia_auth_util_unittest.cc b/google_apis/gaia/gaia_auth_util_unittest.cc index 0f7c702..352c032 100644 --- a/chrome/common/net/gaia/gaia_auth_util_unittest.cc +++ b/google_apis/gaia/gaia_auth_util_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/common/net/gaia/gaia_auth_util.h" +#include "google_apis/gaia/gaia_auth_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/net/gaia/gaia_authenticator.cc b/google_apis/gaia/gaia_authenticator.cc index af12b7a..f9cfa4e 100644 --- a/chrome/common/net/gaia/gaia_authenticator.cc +++ b/google_apis/gaia/gaia_authenticator.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/common/net/gaia/gaia_authenticator.h" +#include "google_apis/gaia/gaia_authenticator.h" #include <string> #include <utility> diff --git a/chrome/common/net/gaia/gaia_authenticator.h b/google_apis/gaia/gaia_authenticator.h index fb5fbb4..4aba67c 100644 --- a/chrome/common/net/gaia/gaia_authenticator.h +++ b/google_apis/gaia/gaia_authenticator.h @@ -25,8 +25,8 @@ // TODO(sanjeevr): This class has been moved here from the bookmarks sync code. // While it is a generic class that handles GAIA authentication, there are some // artifacts of the sync code which needs to be cleaned up. -#ifndef CHROME_COMMON_NET_GAIA_GAIA_AUTHENTICATOR_H_ -#define CHROME_COMMON_NET_GAIA_GAIA_AUTHENTICATOR_H_ +#ifndef GOOGLE_APIS_GAIA_GAIA_AUTHENTICATOR_H_ +#define GOOGLE_APIS_GAIA_GAIA_AUTHENTICATOR_H_ #include <string> @@ -270,4 +270,4 @@ class GaiaAuthenticator { }; } // namespace gaia -#endif // CHROME_COMMON_NET_GAIA_GAIA_AUTHENTICATOR_H_ +#endif // GOOGLE_APIS_GAIA_GAIA_AUTHENTICATOR_H_ diff --git a/chrome/common/net/gaia/gaia_authenticator_unittest.cc b/google_apis/gaia/gaia_authenticator_unittest.cc index 7072a45..8f63193 100644 --- a/chrome/common/net/gaia/gaia_authenticator_unittest.cc +++ b/google_apis/gaia/gaia_authenticator_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/common/net/gaia/gaia_authenticator.h" +#include "google_apis/gaia/gaia_authenticator.h" #include <string> diff --git a/chrome/common/net/gaia/gaia_constants.cc b/google_apis/gaia/gaia_constants.cc index 7d23abe..8a5910c 100644 --- a/chrome/common/net/gaia/gaia_constants.cc +++ b/google_apis/gaia/gaia_constants.cc @@ -4,7 +4,7 @@ // // Constants definitions -#include "chrome/common/net/gaia/gaia_constants.h" +#include "google_apis/gaia/gaia_constants.h" namespace GaiaConstants { diff --git a/chrome/common/net/gaia/gaia_constants.h b/google_apis/gaia/gaia_constants.h index 0f8c370..a00635e 100644 --- a/chrome/common/net/gaia/gaia_constants.h +++ b/google_apis/gaia/gaia_constants.h @@ -4,8 +4,8 @@ // // Constants used by IssueAuthToken and ClientLogin -#ifndef CHROME_COMMON_NET_GAIA_GAIA_CONSTANTS_H_ -#define CHROME_COMMON_NET_GAIA_GAIA_CONSTANTS_H_ +#ifndef GOOGLE_APIS_GAIA_GAIA_CONSTANTS_H_ +#define GOOGLE_APIS_GAIA_GAIA_CONSTANTS_H_ namespace GaiaConstants { @@ -50,4 +50,4 @@ extern const char kClientOAuthchallengeReplyKey[]; } // namespace GaiaConstants -#endif // CHROME_COMMON_NET_GAIA_GAIA_CONSTANTS_H_ +#endif // GOOGLE_APIS_GAIA_GAIA_CONSTANTS_H_ diff --git a/chrome/common/net/gaia/gaia_oauth_client.cc b/google_apis/gaia/gaia_oauth_client.cc index e62f93e7..3ac819e 100644 --- a/chrome/common/net/gaia/gaia_oauth_client.cc +++ b/google_apis/gaia/gaia_oauth_client.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/common/net/gaia/gaia_oauth_client.h" +#include "google_apis/gaia/gaia_oauth_client.h" #include "base/json/json_reader.h" #include "base/logging.h" diff --git a/chrome/common/net/gaia/gaia_oauth_client.h b/google_apis/gaia/gaia_oauth_client.h index b018838..fff51cf 100644 --- a/chrome/common/net/gaia/gaia_oauth_client.h +++ b/google_apis/gaia/gaia_oauth_client.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_COMMON_NET_GAIA_GAIA_OAUTH_CLIENT_H_ -#define CHROME_COMMON_NET_GAIA_GAIA_OAUTH_CLIENT_H_ +#ifndef GOOGLE_APIS_GAIA_GAIA_OAUTH_CLIENT_H_ +#define GOOGLE_APIS_GAIA_GAIA_OAUTH_CLIENT_H_ #include <string> @@ -71,4 +71,4 @@ class GaiaOAuthClient { }; } -#endif // CHROME_COMMON_NET_GAIA_GAIA_OAUTH_CLIENT_H_ +#endif // GOOGLE_APIS_GAIA_GAIA_OAUTH_CLIENT_H_ diff --git a/chrome/common/net/gaia/gaia_oauth_client_unittest.cc b/google_apis/gaia/gaia_oauth_client_unittest.cc index df49161..4991817 100644 --- a/chrome/common/net/gaia/gaia_oauth_client_unittest.cc +++ b/google_apis/gaia/gaia_oauth_client_unittest.cc @@ -9,8 +9,8 @@ #include "base/message_loop.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "chrome/common/net/gaia/gaia_oauth_client.h" #include "chrome/test/base/testing_profile.h" +#include "google_apis/gaia/gaia_oauth_client.h" #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/http/http_status_code.h" diff --git a/chrome/common/net/gaia/gaia_switches.cc b/google_apis/gaia/gaia_switches.cc index 53cdb2e..038bc2f 100644 --- a/chrome/common/net/gaia/gaia_switches.cc +++ b/google_apis/gaia/gaia_switches.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/common/net/gaia/gaia_switches.h" +#include "google_apis/gaia/gaia_switches.h" namespace switches { diff --git a/chrome/common/net/gaia/gaia_switches.h b/google_apis/gaia/gaia_switches.h index 8caeaa3..f8ec659 100644 --- a/chrome/common/net/gaia/gaia_switches.h +++ b/google_apis/gaia/gaia_switches.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_COMMON_NET_GAIA_GAIA_SWITCHES_H_ -#define CHROME_COMMON_NET_GAIA_GAIA_SWITCHES_H_ +#ifndef GOOGLE_APIS_GAIA_GAIA_SWITCHES_H_ +#define GOOGLE_APIS_GAIA_GAIA_SWITCHES_H_ namespace switches { @@ -41,4 +41,4 @@ extern const char kOAuth2TokenUrl[]; } // namespace switches -#endif // CHROME_COMMON_NET_GAIA_GAIA_SWITCHES_H_ +#endif // GOOGLE_APIS_GAIA_GAIA_SWITCHES_H_ diff --git a/chrome/common/net/gaia/gaia_urls.cc b/google_apis/gaia/gaia_urls.cc index 481f6c4..aa5ac38 100644 --- a/chrome/common/net/gaia/gaia_urls.cc +++ b/google_apis/gaia/gaia_urls.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/net/gaia/gaia_urls.h" +#include "google_apis/gaia/gaia_urls.h" #include "base/command_line.h" -#include "chrome/common/net/gaia/gaia_switches.h" -#include "chrome/common/net/google_apis/google_api_keys.h" +#include "google_apis/gaia/gaia_switches.h" +#include "google_apis/google_api_keys.h" namespace { diff --git a/chrome/common/net/gaia/gaia_urls.h b/google_apis/gaia/gaia_urls.h index b657c30..cf7b87c 100644 --- a/chrome/common/net/gaia/gaia_urls.h +++ b/google_apis/gaia/gaia_urls.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_COMMON_NET_GAIA_GAIA_URLS_H_ -#define CHROME_COMMON_NET_GAIA_GAIA_URLS_H_ +#ifndef GOOGLE_APIS_GAIA_GAIA_URLS_H_ +#define GOOGLE_APIS_GAIA_GAIA_URLS_H_ #include <string> @@ -80,4 +80,4 @@ class GaiaUrls { DISALLOW_COPY_AND_ASSIGN(GaiaUrls); }; -#endif // CHROME_COMMON_NET_GAIA_GAIA_URLS_H_ +#endif // GOOGLE_APIS_GAIA_GAIA_URLS_H_ diff --git a/chrome/common/net/gaia/google_service_auth_error.cc b/google_apis/gaia/google_service_auth_error.cc index c428b99..8b115ea 100644 --- a/chrome/common/net/gaia/google_service_auth_error.cc +++ b/google_apis/gaia/google_service_auth_error.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/common/net/gaia/google_service_auth_error.h" +#include "google_apis/gaia/google_service_auth_error.h" #include <string> diff --git a/chrome/common/net/gaia/google_service_auth_error.h b/google_apis/gaia/google_service_auth_error.h index 88f3869..ea434bd 100644 --- a/chrome/common/net/gaia/google_service_auth_error.h +++ b/google_apis/gaia/google_service_auth_error.h @@ -19,8 +19,8 @@ // may forward declare and typedef GoogleServiceAuthError to something shorter // in the comfort of your own translation unit. -#ifndef CHROME_COMMON_NET_GAIA_GOOGLE_SERVICE_AUTH_ERROR_H_ -#define CHROME_COMMON_NET_GAIA_GOOGLE_SERVICE_AUTH_ERROR_H_ +#ifndef GOOGLE_APIS_GAIA_GOOGLE_SERVICE_AUTH_ERROR_H_ +#define GOOGLE_APIS_GAIA_GOOGLE_SERVICE_AUTH_ERROR_H_ #include <string> @@ -206,4 +206,4 @@ class GoogleServiceAuthError { std::string error_message_; }; -#endif // CHROME_COMMON_NET_GAIA_GOOGLE_SERVICE_AUTH_ERROR_H_ +#endif // GOOGLE_APIS_GAIA_GOOGLE_SERVICE_AUTH_ERROR_H_ diff --git a/chrome/common/net/gaia/google_service_auth_error_unittest.cc b/google_apis/gaia/google_service_auth_error_unittest.cc index ed11293..4b83fa6 100644 --- a/chrome/common/net/gaia/google_service_auth_error_unittest.cc +++ b/google_apis/gaia/google_service_auth_error_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/common/net/gaia/google_service_auth_error.h" +#include "google_apis/gaia/google_service_auth_error.h" #include <string> diff --git a/chrome/common/net/gaia/mock_url_fetcher_factory.h b/google_apis/gaia/mock_url_fetcher_factory.h index 7e8a5a8d..d765219 100644 --- a/chrome/common/net/gaia/mock_url_fetcher_factory.h +++ b/google_apis/gaia/mock_url_fetcher_factory.h @@ -5,12 +5,12 @@ // A collection of classes that are useful when testing things that use a // GaiaAuthFetcher. -#ifndef CHROME_COMMON_NET_GAIA_MOCK_URL_FETCHER_FACTORY_H_ -#define CHROME_COMMON_NET_GAIA_MOCK_URL_FETCHER_FACTORY_H_ +#ifndef GOOGLE_APIS_GAIA_MOCK_URL_FETCHER_FACTORY_H_ +#define GOOGLE_APIS_GAIA_MOCK_URL_FETCHER_FACTORY_H_ #include <string> -#include "chrome/common/net/gaia/gaia_auth_fetcher.h" +#include "google_apis/gaia/gaia_auth_fetcher.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_request_status.h" @@ -67,4 +67,4 @@ class MockURLFetcherFactory : public net::URLFetcherFactory, DISALLOW_COPY_AND_ASSIGN(MockURLFetcherFactory); }; -#endif // CHROME_COMMON_NET_GAIA_MOCK_URL_FETCHER_FACTORY_H_ +#endif // GOOGLE_APIS_GAIA_MOCK_URL_FETCHER_FACTORY_H_ diff --git a/chrome/common/net/gaia/oauth2_access_token_consumer.h b/google_apis/gaia/oauth2_access_token_consumer.h index 2c5d2a1..65d32e8 100644 --- a/chrome/common/net/gaia/oauth2_access_token_consumer.h +++ b/google_apis/gaia/oauth2_access_token_consumer.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_COMMON_NET_GAIA_OAUTH2_ACCESS_TOKEN_CONSUMER_H_ -#define CHROME_COMMON_NET_GAIA_OAUTH2_ACCESS_TOKEN_CONSUMER_H_ +#ifndef GOOGLE_APIS_GAIA_OAUTH2_ACCESS_TOKEN_CONSUMER_H_ +#define GOOGLE_APIS_GAIA_OAUTH2_ACCESS_TOKEN_CONSUMER_H_ #include <string> @@ -28,4 +28,4 @@ class OAuth2AccessTokenConsumer { virtual ~OAuth2AccessTokenConsumer() {} }; -#endif // CHROME_COMMON_NET_GAIA_OAUTH2_ACCESS_TOKEN_CONSUMER_H_ +#endif // GOOGLE_APIS_GAIA_OAUTH2_ACCESS_TOKEN_CONSUMER_H_ diff --git a/chrome/common/net/gaia/oauth2_access_token_fetcher.cc b/google_apis/gaia/oauth2_access_token_fetcher.cc index e3d0180..679891c 100644 --- a/chrome/common/net/gaia/oauth2_access_token_fetcher.cc +++ b/google_apis/gaia/oauth2_access_token_fetcher.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/common/net/gaia/oauth2_access_token_fetcher.h" +#include "google_apis/gaia/oauth2_access_token_fetcher.h" #include <algorithm> #include <string> @@ -13,8 +13,8 @@ #include "base/stringprintf.h" #include "base/time.h" #include "base/values.h" -#include "chrome/common/net/gaia/gaia_urls.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" +#include "google_apis/gaia/gaia_urls.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "net/base/escape.h" #include "net/base/load_flags.h" #include "net/http/http_status_code.h" diff --git a/chrome/common/net/gaia/oauth2_access_token_fetcher.h b/google_apis/gaia/oauth2_access_token_fetcher.h index 3242e62..24f4d85 100644 --- a/chrome/common/net/gaia/oauth2_access_token_fetcher.h +++ b/google_apis/gaia/oauth2_access_token_fetcher.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_COMMON_NET_GAIA_OAUTH2_ACCESS_TOKEN_FETCHER_H_ -#define CHROME_COMMON_NET_GAIA_OAUTH2_ACCESS_TOKEN_FETCHER_H_ +#ifndef GOOGLE_APIS_GAIA_OAUTH2_ACCESS_TOKEN_FETCHER_H_ +#define GOOGLE_APIS_GAIA_OAUTH2_ACCESS_TOKEN_FETCHER_H_ #include <string> #include <vector> #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" -#include "chrome/common/net/gaia/oauth2_access_token_consumer.h" +#include "google_apis/gaia/oauth2_access_token_consumer.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_fetcher_delegate.h" @@ -115,4 +115,4 @@ class OAuth2AccessTokenFetcher : public net::URLFetcherDelegate { DISALLOW_COPY_AND_ASSIGN(OAuth2AccessTokenFetcher); }; -#endif // CHROME_COMMON_NET_GAIA_OAUTH2_ACCESS_TOKEN_FETCHER_H_ +#endif // GOOGLE_APIS_GAIA_OAUTH2_ACCESS_TOKEN_FETCHER_H_ diff --git a/chrome/common/net/gaia/oauth2_access_token_fetcher_unittest.cc b/google_apis/gaia/oauth2_access_token_fetcher_unittest.cc index 22b12a4..feb8020 100644 --- a/chrome/common/net/gaia/oauth2_access_token_fetcher_unittest.cc +++ b/google_apis/gaia/oauth2_access_token_fetcher_unittest.cc @@ -8,12 +8,12 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "chrome/common/net/gaia/gaia_urls.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" -#include "chrome/common/net/gaia/oauth2_access_token_consumer.h" -#include "chrome/common/net/gaia/oauth2_access_token_fetcher.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" +#include "google_apis/gaia/gaia_urls.h" +#include "google_apis/gaia/google_service_auth_error.h" +#include "google_apis/gaia/oauth2_access_token_consumer.h" +#include "google_apis/gaia/oauth2_access_token_fetcher.h" #include "googleurl/src/gurl.h" #include "net/http/http_status_code.h" #include "net/url_request/test_url_fetcher_factory.h" diff --git a/chrome/common/net/gaia/oauth2_api_call_flow.cc b/google_apis/gaia/oauth2_api_call_flow.cc index 4d43e51..9037764 100644 --- a/chrome/common/net/gaia/oauth2_api_call_flow.cc +++ b/google_apis/gaia/oauth2_api_call_flow.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/net/gaia/oauth2_api_call_flow.h" +#include "google_apis/gaia/oauth2_api_call_flow.h" #include <string> #include <vector> #include "base/basictypes.h" #include "base/stringprintf.h" -#include "chrome/common/net/gaia/gaia_urls.h" +#include "google_apis/gaia/gaia_urls.h" #include "net/base/escape.h" #include "net/base/load_flags.h" #include "net/http/http_status_code.h" diff --git a/chrome/common/net/gaia/oauth2_api_call_flow.h b/google_apis/gaia/oauth2_api_call_flow.h index c53aa45..419c842 100644 --- a/chrome/common/net/gaia/oauth2_api_call_flow.h +++ b/google_apis/gaia/oauth2_api_call_flow.h @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_COMMON_NET_GAIA_OAUTH2_API_CALL_FLOW_H_ -#define CHROME_COMMON_NET_GAIA_OAUTH2_API_CALL_FLOW_H_ +#ifndef GOOGLE_APIS_GAIA_OAUTH2_API_CALL_FLOW_H_ +#define GOOGLE_APIS_GAIA_OAUTH2_API_CALL_FLOW_H_ #include <string> #include "base/memory/scoped_ptr.h" -#include "chrome/common/net/gaia/oauth2_access_token_consumer.h" -#include "chrome/common/net/gaia/oauth2_access_token_fetcher.h" -#include "chrome/common/net/gaia/oauth2_mint_token_consumer.h" -#include "chrome/common/net/gaia/oauth2_mint_token_fetcher.h" +#include "google_apis/gaia/oauth2_access_token_consumer.h" +#include "google_apis/gaia/oauth2_access_token_fetcher.h" +#include "google_apis/gaia/oauth2_mint_token_consumer.h" +#include "google_apis/gaia/oauth2_mint_token_fetcher.h" #include "net/url_request/url_fetcher_delegate.h" class GoogleServiceAuthError; @@ -125,4 +125,4 @@ class OAuth2ApiCallFlow DISALLOW_COPY_AND_ASSIGN(OAuth2ApiCallFlow); }; -#endif // CHROME_COMMON_NET_GAIA_OAUTH2_API_CALL_FLOW_H_ +#endif // GOOGLE_APIS_GAIA_OAUTH2_API_CALL_FLOW_H_ diff --git a/chrome/common/net/gaia/oauth2_api_call_flow_unittest.cc b/google_apis/gaia/oauth2_api_call_flow_unittest.cc index b042f3b..137eaeb 100644 --- a/chrome/common/net/gaia/oauth2_api_call_flow_unittest.cc +++ b/google_apis/gaia/oauth2_api_call_flow_unittest.cc @@ -9,12 +9,12 @@ #include "base/memory/scoped_ptr.h" #include "base/time.h" -#include "chrome/common/net/gaia/gaia_urls.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" -#include "chrome/common/net/gaia/oauth2_access_token_consumer.h" -#include "chrome/common/net/gaia/oauth2_access_token_fetcher.h" -#include "chrome/common/net/gaia/oauth2_api_call_flow.h" #include "chrome/test/base/testing_profile.h" +#include "google_apis/gaia/gaia_urls.h" +#include "google_apis/gaia/google_service_auth_error.h" +#include "google_apis/gaia/oauth2_access_token_consumer.h" +#include "google_apis/gaia/oauth2_access_token_fetcher.h" +#include "google_apis/gaia/oauth2_api_call_flow.h" #include "net/http/http_request_headers.h" #include "net/http/http_status_code.h" #include "net/url_request/test_url_fetcher_factory.h" diff --git a/chrome/common/net/gaia/oauth2_mint_token_consumer.h b/google_apis/gaia/oauth2_mint_token_consumer.h index 48e5b40..95ea12e 100644 --- a/chrome/common/net/gaia/oauth2_mint_token_consumer.h +++ b/google_apis/gaia/oauth2_mint_token_consumer.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_COMMON_NET_GAIA_OAUTH2_MINT_TOKEN_CONSUMER_H_ -#define CHROME_COMMON_NET_GAIA_OAUTH2_MINT_TOKEN_CONSUMER_H_ +#ifndef GOOGLE_APIS_GAIA_OAUTH2_MINT_TOKEN_CONSUMER_H_ +#define GOOGLE_APIS_GAIA_OAUTH2_MINT_TOKEN_CONSUMER_H_ #include <string> @@ -19,4 +19,4 @@ class OAuth2MintTokenConsumer { virtual void OnMintTokenFailure(const GoogleServiceAuthError& error) {} }; -#endif // CHROME_COMMON_NET_GAIA_OAUTH2_MINT_TOKEN_CONSUMER_H_ +#endif // GOOGLE_APIS_GAIA_OAUTH2_MINT_TOKEN_CONSUMER_H_ diff --git a/chrome/common/net/gaia/oauth2_mint_token_fetcher.cc b/google_apis/gaia/oauth2_mint_token_fetcher.cc index e46b307..425a126 100644 --- a/chrome/common/net/gaia/oauth2_mint_token_fetcher.cc +++ b/google_apis/gaia/oauth2_mint_token_fetcher.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/common/net/gaia/oauth2_mint_token_fetcher.h" +#include "google_apis/gaia/oauth2_mint_token_fetcher.h" #include <algorithm> #include <string> @@ -11,8 +11,8 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/values.h" -#include "chrome/common/net/gaia/gaia_urls.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" +#include "google_apis/gaia/gaia_urls.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "net/base/escape.h" #include "net/base/load_flags.h" #include "net/http/http_status_code.h" diff --git a/chrome/common/net/gaia/oauth2_mint_token_fetcher.h b/google_apis/gaia/oauth2_mint_token_fetcher.h index 359ee35..4995c7a 100644 --- a/chrome/common/net/gaia/oauth2_mint_token_fetcher.h +++ b/google_apis/gaia/oauth2_mint_token_fetcher.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_COMMON_NET_GAIA_OAUTH2_MINT_TOKEN_FETCHER_H_ -#define CHROME_COMMON_NET_GAIA_OAUTH2_MINT_TOKEN_FETCHER_H_ +#ifndef GOOGLE_APIS_GAIA_OAUTH2_MINT_TOKEN_FETCHER_H_ +#define GOOGLE_APIS_GAIA_OAUTH2_MINT_TOKEN_FETCHER_H_ #include <string> #include <vector> #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" -#include "chrome/common/net/gaia/oauth2_mint_token_consumer.h" +#include "google_apis/gaia/oauth2_mint_token_consumer.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_fetcher_delegate.h" @@ -101,4 +101,4 @@ class OAuth2MintTokenFetcher : public net::URLFetcherDelegate { DISALLOW_COPY_AND_ASSIGN(OAuth2MintTokenFetcher); }; -#endif // CHROME_COMMON_NET_GAIA_OAUTH2_MINT_TOKEN_FETCHER_H_ +#endif // GOOGLE_APIS_GAIA_OAUTH2_MINT_TOKEN_FETCHER_H_ diff --git a/chrome/common/net/gaia/oauth2_mint_token_fetcher_unittest.cc b/google_apis/gaia/oauth2_mint_token_fetcher_unittest.cc index 015bb99..fda775b 100644 --- a/chrome/common/net/gaia/oauth2_mint_token_fetcher_unittest.cc +++ b/google_apis/gaia/oauth2_mint_token_fetcher_unittest.cc @@ -9,12 +9,12 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "chrome/common/net/gaia/gaia_urls.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" -#include "chrome/common/net/gaia/oauth2_mint_token_consumer.h" -#include "chrome/common/net/gaia/oauth2_mint_token_fetcher.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" +#include "google_apis/gaia/gaia_urls.h" +#include "google_apis/gaia/google_service_auth_error.h" +#include "google_apis/gaia/oauth2_mint_token_consumer.h" +#include "google_apis/gaia/oauth2_mint_token_fetcher.h" #include "googleurl/src/gurl.h" #include "net/http/http_status_code.h" #include "net/url_request/test_url_fetcher_factory.h" diff --git a/chrome/common/net/gaia/oauth2_mint_token_flow.cc b/google_apis/gaia/oauth2_mint_token_flow.cc index 80091f5..66dd1a0 100644 --- a/chrome/common/net/gaia/oauth2_mint_token_flow.cc +++ b/google_apis/gaia/oauth2_mint_token_flow.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/common/net/gaia/oauth2_mint_token_flow.h" +#include "google_apis/gaia/oauth2_mint_token_flow.h" #include <string> #include <vector> @@ -16,8 +16,8 @@ #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/common/net/gaia/gaia_urls.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" +#include "google_apis/gaia/gaia_urls.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "net/base/escape.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_request_context_getter.h" diff --git a/chrome/common/net/gaia/oauth2_mint_token_flow.h b/google_apis/gaia/oauth2_mint_token_flow.h index 2fb64ce..cdca9ec 100644 --- a/chrome/common/net/gaia/oauth2_mint_token_flow.h +++ b/google_apis/gaia/oauth2_mint_token_flow.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_COMMON_NET_GAIA_OAUTH2_MINT_TOKEN_FLOW_H_ -#define CHROME_COMMON_NET_GAIA_OAUTH2_MINT_TOKEN_FLOW_H_ +#ifndef GOOGLE_APIS_GAIA_OAUTH2_MINT_TOKEN_FLOW_H_ +#define GOOGLE_APIS_GAIA_OAUTH2_MINT_TOKEN_FLOW_H_ #include <string> #include <vector> #include "base/memory/weak_ptr.h" #include "base/string16.h" -#include "chrome/common/net/gaia/oauth2_api_call_flow.h" +#include "google_apis/gaia/oauth2_api_call_flow.h" class GoogleServiceAuthError; class OAuth2MintTokenFlowTest; @@ -150,4 +150,4 @@ class OAuth2MintTokenFlow : public OAuth2ApiCallFlow { DISALLOW_COPY_AND_ASSIGN(OAuth2MintTokenFlow); }; -#endif // CHROME_COMMON_NET_GAIA_OAUTH2_MINT_TOKEN_FLOW_H_ +#endif // GOOGLE_APIS_GAIA_OAUTH2_MINT_TOKEN_FLOW_H_ diff --git a/chrome/common/net/gaia/oauth2_mint_token_flow_unittest.cc b/google_apis/gaia/oauth2_mint_token_flow_unittest.cc index 4ccb00a..4b24e939 100644 --- a/chrome/common/net/gaia/oauth2_mint_token_flow_unittest.cc +++ b/google_apis/gaia/oauth2_mint_token_flow_unittest.cc @@ -9,10 +9,10 @@ #include "base/json/json_reader.h" #include "base/memory/scoped_ptr.h" -#include "base/values.h" #include "base/utf_string_conversions.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" -#include "chrome/common/net/gaia/oauth2_mint_token_flow.h" +#include "base/values.h" +#include "google_apis/gaia/google_service_auth_error.h" +#include "google_apis/gaia/oauth2_mint_token_flow.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_request_status.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/common/net/gaia/oauth2_revocation_consumer.h b/google_apis/gaia/oauth2_revocation_consumer.h index 742b1fe..2004fec 100644 --- a/chrome/common/net/gaia/oauth2_revocation_consumer.h +++ b/google_apis/gaia/oauth2_revocation_consumer.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_COMMON_NET_GAIA_OAUTH2_REVOCATION_CONSUMER_H_ -#define CHROME_COMMON_NET_GAIA_OAUTH2_REVOCATION_CONSUMER_H_ +#ifndef GOOGLE_APIS_GAIA_OAUTH2_REVOCATION_CONSUMER_H_ +#define GOOGLE_APIS_GAIA_OAUTH2_REVOCATION_CONSUMER_H_ #include <string> @@ -19,4 +19,4 @@ class OAuth2RevocationConsumer { virtual void OnRevocationFailure(const GoogleServiceAuthError& error) {} }; -#endif // CHROME_COMMON_NET_GAIA_OAUTH2_REVOCATION_CONSUMER_H_ +#endif // GOOGLE_APIS_GAIA_OAUTH2_REVOCATION_CONSUMER_H_ diff --git a/chrome/common/net/gaia/oauth2_revocation_fetcher.cc b/google_apis/gaia/oauth2_revocation_fetcher.cc index 63a4baf..2a4bae5 100644 --- a/chrome/common/net/gaia/oauth2_revocation_fetcher.cc +++ b/google_apis/gaia/oauth2_revocation_fetcher.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/common/net/gaia/oauth2_revocation_fetcher.h" +#include "google_apis/gaia/oauth2_revocation_fetcher.h" #include <algorithm> #include <string> @@ -12,8 +12,8 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/values.h" -#include "chrome/common/net/gaia/gaia_urls.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" +#include "google_apis/gaia/gaia_urls.h" +#include "google_apis/gaia/google_service_auth_error.h" #include "net/base/escape.h" #include "net/base/load_flags.h" #include "net/http/http_status_code.h" diff --git a/chrome/common/net/gaia/oauth2_revocation_fetcher.h b/google_apis/gaia/oauth2_revocation_fetcher.h index 6c17893..a87ee78 100644 --- a/chrome/common/net/gaia/oauth2_revocation_fetcher.h +++ b/google_apis/gaia/oauth2_revocation_fetcher.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_COMMON_NET_GAIA_OAUTH2_REVOCATION_FETCHER_H_ -#define CHROME_COMMON_NET_GAIA_OAUTH2_REVOCATION_FETCHER_H_ +#ifndef GOOGLE_APIS_GAIA_OAUTH2_REVOCATION_FETCHER_H_ +#define GOOGLE_APIS_GAIA_OAUTH2_REVOCATION_FETCHER_H_ #include <string> #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" -#include "chrome/common/net/gaia/oauth2_revocation_consumer.h" +#include "google_apis/gaia/oauth2_revocation_consumer.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_fetcher_delegate.h" @@ -91,4 +91,4 @@ class OAuth2RevocationFetcher : public net::URLFetcherDelegate { DISALLOW_COPY_AND_ASSIGN(OAuth2RevocationFetcher); }; -#endif // CHROME_COMMON_NET_GAIA_OAUTH2_REVOCATION_FETCHER_H_ +#endif // GOOGLE_APIS_GAIA_OAUTH2_REVOCATION_FETCHER_H_ diff --git a/chrome/common/net/gaia/oauth2_revocation_fetcher_unittest.cc b/google_apis/gaia/oauth2_revocation_fetcher_unittest.cc index bba6375..17f53ad 100644 --- a/chrome/common/net/gaia/oauth2_revocation_fetcher_unittest.cc +++ b/google_apis/gaia/oauth2_revocation_fetcher_unittest.cc @@ -8,12 +8,12 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "chrome/common/net/gaia/gaia_urls.h" -#include "chrome/common/net/gaia/google_service_auth_error.h" -#include "chrome/common/net/gaia/oauth2_revocation_consumer.h" -#include "chrome/common/net/gaia/oauth2_revocation_fetcher.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" +#include "google_apis/gaia/gaia_urls.h" +#include "google_apis/gaia/google_service_auth_error.h" +#include "google_apis/gaia/oauth2_revocation_consumer.h" +#include "google_apis/gaia/oauth2_revocation_fetcher.h" #include "googleurl/src/gurl.h" #include "net/http/http_status_code.h" #include "net/url_request/test_url_fetcher_factory.h" diff --git a/chrome/common/net/gaia/oauth_request_signer.cc b/google_apis/gaia/oauth_request_signer.cc index 651d483..7ba947b 100644 --- a/chrome/common/net/gaia/oauth_request_signer.cc +++ b/google_apis/gaia/oauth_request_signer.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/common/net/gaia/oauth_request_signer.h" +#include "google_apis/gaia/oauth_request_signer.h" #include <cctype> #include <cstddef> diff --git a/chrome/common/net/gaia/oauth_request_signer.h b/google_apis/gaia/oauth_request_signer.h index dbe4567..3b91d4d 100644 --- a/chrome/common/net/gaia/oauth_request_signer.h +++ b/google_apis/gaia/oauth_request_signer.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_COMMON_NET_GAIA_OAUTH_REQUEST_SIGNER_H_ -#define CHROME_COMMON_NET_GAIA_OAUTH_REQUEST_SIGNER_H_ +#ifndef GOOGLE_APIS_GAIA_OAUTH_REQUEST_SIGNER_H_ +#define GOOGLE_APIS_GAIA_OAUTH_REQUEST_SIGNER_H_ #include <map> #include <string> @@ -97,4 +97,4 @@ class OAuthRequestSigner { DISALLOW_IMPLICIT_CONSTRUCTORS(OAuthRequestSigner); }; -#endif // CHROME_COMMON_NET_GAIA_OAUTH_REQUEST_SIGNER_H_ +#endif // GOOGLE_APIS_GAIA_OAUTH_REQUEST_SIGNER_H_ diff --git a/chrome/common/net/gaia/oauth_request_signer_unittest.cc b/google_apis/gaia/oauth_request_signer_unittest.cc index 4b4077ea..5cf2dc2 100644 --- a/chrome/common/net/gaia/oauth_request_signer_unittest.cc +++ b/google_apis/gaia/oauth_request_signer_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/common/net/gaia/oauth_request_signer.h" +#include "google_apis/gaia/oauth_request_signer.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/net/google_apis/google_api_keys.cc b/google_apis/google_api_keys.cc index b86c9cc..e21ae1a 100644 --- a/chrome/common/net/google_apis/google_api_keys.cc +++ b/google_apis/google_api_keys.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/common/net/google_apis/google_api_keys.h" +#include "google_apis/google_api_keys.h" #include "base/command_line.h" #include "base/environment.h" @@ -13,7 +13,7 @@ #if defined(GOOGLE_CHROME_BUILD) // TODO(joi): Include a src-internal file that defines the official // keys for official builds, something like: #include -// "chrome/app/internal/official_google_api_keys.h" +// "google_apis/internal/official_google_api_keys.h" #endif #if !defined(GOOGLE_API_KEY) diff --git a/chrome/common/net/google_apis/google_api_keys.h b/google_apis/google_api_keys.h index 60243fe..8ba3215 100644 --- a/chrome/common/net/google_apis/google_api_keys.h +++ b/google_apis/google_api_keys.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_COMMON_NET_GOOGLE_APIS_GOOGLE_API_KEYS_H_ -#define CHROME_COMMON_NET_GOOGLE_APIS_GOOGLE_API_KEYS_H_ +#ifndef GOOGLE_APIS_GOOGLE_API_KEYS_H_ +#define GOOGLE_APIS_GOOGLE_API_KEYS_H_ #include <string> @@ -86,4 +86,4 @@ std::string GetOAuth2ClientSecret(OAuth2Client client); } // namespace google_apis -#endif // CHROME_COMMON_NET_GOOGLE_APIS_GOOGLE_API_KEYS_H_ +#endif // GOOGLE_APIS_GOOGLE_API_KEYS_H_ diff --git a/google_apis/google_apis.gyp b/google_apis/google_apis.gyp new file mode 100644 index 0000000..b0b81e4 --- /dev/null +++ b/google_apis/google_apis.gyp @@ -0,0 +1,83 @@ +# Copyright (c) 2012 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'variables': { + 'chromium_code': 1, # Use higher warning level. + }, + 'includes': [ + '../build/win_precompile.gypi', + ], + 'targets': [ + { + 'target_name': 'google_apis', + 'type': 'static_library', + 'dependencies': [ + '../base/base.gyp:base', + '../crypto/crypto.gyp:crypto', + '../net/net.gyp:net', + ], + 'sources': [ + 'gaia/gaia_auth_consumer.cc', + 'gaia/gaia_auth_consumer.h', + 'gaia/gaia_auth_fetcher.cc', + 'gaia/gaia_auth_fetcher.h', + 'gaia/gaia_auth_util.cc', + 'gaia/gaia_auth_util.h', + 'gaia/gaia_authenticator.cc', + 'gaia/gaia_authenticator.h', + 'gaia/gaia_constants.cc', + 'gaia/gaia_constants.h', + 'gaia/gaia_oauth_client.cc', + 'gaia/gaia_oauth_client.h', + 'gaia/gaia_switches.cc', + 'gaia/gaia_switches.h', + 'gaia/gaia_urls.cc', + 'gaia/gaia_urls.h', + 'gaia/google_service_auth_error.cc', + 'gaia/google_service_auth_error.h', + 'gaia/oauth_request_signer.cc', + 'gaia/oauth_request_signer.h', + 'gaia/oauth2_access_token_consumer.h', + 'gaia/oauth2_access_token_fetcher.cc', + 'gaia/oauth2_access_token_fetcher.h', + 'gaia/oauth2_api_call_flow.cc', + 'gaia/oauth2_api_call_flow.h', + 'gaia/oauth2_mint_token_consumer.h', + 'gaia/oauth2_mint_token_fetcher.cc', + 'gaia/oauth2_mint_token_fetcher.h', + 'gaia/oauth2_mint_token_flow.cc', + 'gaia/oauth2_mint_token_flow.h', + 'gaia/oauth2_revocation_consumer.h', + 'gaia/oauth2_revocation_fetcher.cc', + 'gaia/oauth2_revocation_fetcher.h', + 'google_api_keys.cc', + 'google_api_keys.h', + ], + }, + { + 'target_name': 'google_apis_unittests', + 'type': 'static_library', + 'dependencies': [ + '../base/base.gyp:base', + '../testing/gmock.gyp:gmock', + '../testing/gtest.gyp:gtest', + ], + 'sources': [ + 'gaia/mock_url_fetcher_factory.h', + 'gaia/gaia_auth_fetcher_unittest.cc', + 'gaia/gaia_auth_util_unittest.cc', + 'gaia/gaia_authenticator_unittest.cc', + 'gaia/gaia_oauth_client_unittest.cc', + 'gaia/google_service_auth_error_unittest.cc', + 'gaia/oauth_request_signer_unittest.cc', + 'gaia/oauth2_access_token_fetcher_unittest.cc', + 'gaia/oauth2_api_call_flow_unittest.cc', + 'gaia/oauth2_mint_token_fetcher_unittest.cc', + 'gaia/oauth2_mint_token_flow_unittest.cc', + 'gaia/oauth2_revocation_fetcher_unittest.cc', + ], + }, + ], +} diff --git a/remoting/DEPS b/remoting/DEPS index b13f259..8018872 100644 --- a/remoting/DEPS +++ b/remoting/DEPS @@ -4,6 +4,7 @@ include_rules = [ "+content/common", "+crypto", + "+google_apis", "+media/base", # Note: Only for net::EnableSSLServerSockets(), which must be called by diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc index c58e9ad..9f8329d 100644 --- a/remoting/host/remoting_me2me_host.cc +++ b/remoting/host/remoting_me2me_host.cc @@ -22,8 +22,8 @@ #include "base/utf_string_conversions.h" #include "base/win/windows_version.h" #include "build/build_config.h" -#include "chrome/common/net/google_apis/google_api_keys.h" #include "crypto/nss_util.h" +#include "google_apis/google_api_keys.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_channel_proxy.h" #include "net/base/network_change_notifier.h" @@ -35,6 +35,7 @@ #include "remoting/host/chromoting_host.h" #include "remoting/host/chromoting_host_context.h" #include "remoting/host/chromoting_messages.h" +#include "remoting/host/config_file_watcher.h" #include "remoting/host/constants.h" #include "remoting/host/config_file_watcher.h" #include "remoting/host/desktop_environment.h" diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index fa6748d3..6b21768 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -1440,16 +1440,12 @@ 'remoting_jingle_glue', '../base/base.gyp:base', '../base/base.gyp:base_i18n', + '../google_apis/google_apis.gyp:google_apis', '../ipc/ipc.gyp:ipc', '../media/media.gyp:media', '../net/net.gyp:net', ], 'sources': [ - # TODO(joi): Clean this up with a lib once we move it to its - # final destination. See TODO in remoting/host/DEPS. - '../chrome/common/net/google_apis/google_api_keys.cc', - '../chrome/common/net/google_apis/google_api_keys.h', - 'host/branding.cc', 'host/branding.h', 'host/config_file_watcher.cc', |