summaryrefslogtreecommitdiffstats
path: root/chromium/google_apis/gaia/gaia_urls.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/google_apis/gaia/gaia_urls.cc')
-rw-r--r--chromium/google_apis/gaia/gaia_urls.cc23
1 files changed, 1 insertions, 22 deletions
diff --git a/chromium/google_apis/gaia/gaia_urls.cc b/chromium/google_apis/gaia/gaia_urls.cc
index 053f7a37e29..0b44a911c74 100644
--- a/chromium/google_apis/gaia/gaia_urls.cc
+++ b/chromium/google_apis/gaia/gaia_urls.cc
@@ -28,15 +28,10 @@ const char kOAuthGetAccessTokenUrlSuffix[] = "OAuthGetAccessToken";
const char kOAuthWrapBridgeUrlSuffix[] = "OAuthWrapBridge";
const char kOAuth1LoginUrlSuffix[] = "OAuthLogin";
const char kOAuthRevokeTokenUrlSuffix[] = "AuthSubRevokeToken";
-const char kListAccountsSuffix[] = "ListAccounts";
+const char kListAccountsSuffix[] = "ListAccounts?json=standard";
const char kEmbeddedSigninSuffix[] = "EmbeddedSignIn";
const char kAddAccountSuffix[] = "AddSession";
-// OAuth scopes
-const char kOAuth1LoginScope[] = "https://www.google.com/accounts/OAuthLogin";
-const char kOAuthWrapBridgeUserInfoScope[] =
- "https://www.googleapis.com/auth/userinfo.email";
-
// API calls from accounts.google.com (LSO)
const char kGetOAuthTokenUrlSuffix[] = "o/oauth/GetOAuthToken/";
const char kClientLoginToOAuth2UrlSuffix[] = "o/oauth2/programmatic_auth";
@@ -127,14 +122,6 @@ GaiaUrls::GaiaUrls() {
google_apis_origin_url_.Resolve(kOAuthUserInfoUrlSuffix);
gaia_login_form_realm_ = gaia_url_;
-
- // OAuth scopes.
- GetSwitchValueWithDefault(switches::kOAuthWrapBridgeUserInfoScope,
- kOAuthWrapBridgeUserInfoScope,
- &oauth_wrap_bridge_user_info_scope_);
- GetSwitchValueWithDefault(switches::kOAuth1LoginScope,
- kOAuth1LoginScope,
- &oauth1_login_scope_);
}
GaiaUrls::~GaiaUrls() {
@@ -216,14 +203,6 @@ const GURL& GaiaUrls::add_account_url() const {
return add_account_url_;
}
-const std::string& GaiaUrls::oauth1_login_scope() const {
- return oauth1_login_scope_;
-}
-
-const std::string& GaiaUrls::oauth_wrap_bridge_user_info_scope() const {
- return oauth_wrap_bridge_user_info_scope_;
-}
-
const std::string& GaiaUrls::oauth2_chrome_client_id() const {
return oauth2_chrome_client_id_;
}