diff options
| author | dzhioev <dzhioev@chromium.org> | 2015-03-31 13:54:46 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-31 20:55:31 +0000 |
| commit | 5bdc6c23e66b17b5b1926a4ee12e854d0573a823 (patch) | |
| tree | f313a6297a113242731996204098646fafb9a302 /google_apis | |
| parent | 6e061dfc433855af05b3a5b3073acbca77729ded (diff) | |
| download | chromium_src-5bdc6c23e66b17b5b1926a4ee12e854d0573a823.zip chromium_src-5bdc6c23e66b17b5b1926a4ee12e854d0573a823.tar.gz chromium_src-5bdc6c23e66b17b5b1926a4ee12e854d0573a823.tar.bz2 | |
Removed 'gaia-endpoint-chromeos' switch.
BUG=none
TEST=browser_tests
Review URL: https://codereview.chromium.org/1049703003
Cr-Commit-Position: refs/heads/master@{#323106}
Diffstat (limited to 'google_apis')
| -rw-r--r-- | google_apis/gaia/fake_gaia.cc | 5 | ||||
| -rw-r--r-- | google_apis/gaia/gaia_urls.cc | 8 | ||||
| -rw-r--r-- | google_apis/gaia/gaia_urls.h | 2 |
3 files changed, 15 insertions, 0 deletions
diff --git a/google_apis/gaia/fake_gaia.cc b/google_apis/gaia/fake_gaia.cc index c755cda..5622460 100644 --- a/google_apis/gaia/fake_gaia.cc +++ b/google_apis/gaia/fake_gaia.cc @@ -212,6 +212,11 @@ void FakeGaia::Initialize() { REGISTER_RESPONSE_HANDLER( gaia_urls->service_login_url(), HandleServiceLogin); + // Handles /embedded/setup/chromeos GAIA call. + // Same handler as for /ServiceLogin is used for now. + REGISTER_RESPONSE_HANDLER( + gaia_urls->embedded_setup_chromeos_url(), HandleServiceLogin); + // Handles /OAuthLogin GAIA call. REGISTER_RESPONSE_HANDLER( gaia_urls->oauth1_login_url(), HandleOAuthLogin); diff --git a/google_apis/gaia/gaia_urls.cc b/google_apis/gaia/gaia_urls.cc index f0e8c07..6545d56 100644 --- a/google_apis/gaia/gaia_urls.cc +++ b/google_apis/gaia/gaia_urls.cc @@ -19,6 +19,7 @@ const char kDefaultGoogleApisBaseUrl[] = "https://www.googleapis.com"; // API calls from accounts.google.com const char kClientLoginUrlSuffix[] = "ClientLogin"; const char kServiceLoginUrlSuffix[] = "ServiceLogin"; +const char kEmbeddedSetupChromeOsUrlSuffix[] = "embedded/setup/chromeos"; const char kServiceLoginAuthUrlSuffix[] = "ServiceLoginAuth"; const char kServiceLogoutUrlSuffix[] = "Logout"; const char kIssueAuthTokenUrlSuffix[] = "IssueAuthToken"; @@ -93,6 +94,8 @@ GaiaUrls::GaiaUrls() { // URLs from accounts.google.com. client_login_url_ = gaia_url_.Resolve(kClientLoginUrlSuffix); service_login_url_ = gaia_url_.Resolve(kServiceLoginUrlSuffix); + embedded_setup_chromeos_url_ = + gaia_url_.Resolve(kEmbeddedSetupChromeOsUrlSuffix); service_login_auth_url_ = gaia_url_.Resolve(kServiceLoginAuthUrlSuffix); service_logout_url_ = gaia_url_.Resolve(kServiceLogoutUrlSuffix); issue_auth_token_url_ = gaia_url_.Resolve(kIssueAuthTokenUrlSuffix); @@ -150,6 +153,11 @@ const GURL& GaiaUrls::service_login_url() const { return service_login_url_; } +const GURL& GaiaUrls::embedded_setup_chromeos_url() const { + return embedded_setup_chromeos_url_; +} + + const GURL& GaiaUrls::service_login_auth_url() const { return service_login_auth_url_; } diff --git a/google_apis/gaia/gaia_urls.h b/google_apis/gaia/gaia_urls.h index f41e41c..b5453f2 100644 --- a/google_apis/gaia/gaia_urls.h +++ b/google_apis/gaia/gaia_urls.h @@ -20,6 +20,7 @@ class GaiaUrls { const GURL& captcha_base_url() const; const GURL& client_login_url() const; const GURL& service_login_url() const; + const GURL& embedded_setup_chromeos_url() const; const GURL& service_login_auth_url() const; const GURL& service_logout_url() const; const GURL& issue_auth_token_url() const; @@ -64,6 +65,7 @@ class GaiaUrls { GURL client_login_url_; GURL service_login_url_; + GURL embedded_setup_chromeos_url_; GURL service_login_auth_url_; GURL service_logout_url_; GURL issue_auth_token_url_; |