Remove command-line flags for OAuth scopes.

There is no reason why one would want to switch to alternate OAuth
scopes, because these are identifiers and not URLs to make requests
to.

BUG=chromium:350299
TBR=bauerb@chromium.org

Review URL: https://codereview.chromium.org/190353002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256541 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 13 insertions, 42 deletions

diff --git a/google_apis/gaia/fake_gaia.cc b/google_apis/gaia/fake_gaia.cc
index 3eec9a8..4cfe604 100644
--- a/google_apis/gaia/fake_gaia.cc
+++ b/google_apis/gaia/fake_gaia.cc
@@ -20,6 +20,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
+#include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/url_util.h"
 #include "net/cookies/parsed_cookie.h"
@@ -263,7 +264,7 @@ void FakeGaia::HandleProgramaticAuth(
   GaiaUrls* gaia_urls = GaiaUrls::GetInstance();
   std::string scope;
   if (!GetQueryParameter(request.content, "scope", &scope) ||
-      gaia_urls->oauth1_login_scope() != scope) {
+      GaiaConstants::kOAuth1LoginScope != scope) {
     return;
   }
 
@@ -434,7 +435,7 @@ void FakeGaia::HandleAuthToken(const HttpRequest& request,
       return;
     }
 
-    if (GaiaUrls::GetInstance()->oauth1_login_scope() != scope) {
+    if (GaiaConstants::kOAuth1LoginScope != scope) {
       http_response->set_code(net::HTTP_BAD_REQUEST);
       LOG(ERROR) << "Invalid scope for /o/oauth2/token - " << scope;
       return;
diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_fetcher.cc
index 96b698d3..01e9567 100644
--- a/google_apis/gaia/gaia_auth_fetcher.cc
+++ b/google_apis/gaia/gaia_auth_fetcher.cc
@@ -305,7 +305,7 @@ std::string GaiaAuthFetcher::MakeIssueAuthTokenBody(
 // static
 std::string GaiaAuthFetcher::MakeGetAuthCodeBody() {
   std::string encoded_scope = net::EscapeUrlEncodedData(
-      GaiaUrls::GetInstance()->oauth1_login_scope(), true);
+      GaiaConstants::kOAuth1LoginScope, true);
   std::string encoded_client_id = net::EscapeUrlEncodedData(
       GaiaUrls::GetInstance()->oauth2_chrome_client_id(), true);
   return base::StringPrintf(kClientLoginToOAuth2BodyFormat,
@@ -317,7 +317,7 @@ std::string GaiaAuthFetcher::MakeGetAuthCodeBody() {
 std::string GaiaAuthFetcher::MakeGetTokenPairBody(
     const std::string& auth_code) {
   std::string encoded_scope = net::EscapeUrlEncodedData(
-      GaiaUrls::GetInstance()->oauth1_login_scope(), true);
+      GaiaConstants::kOAuth1LoginScope, true);
   std::string encoded_client_id = net::EscapeUrlEncodedData(
       GaiaUrls::GetInstance()->oauth2_chrome_client_id(), true);
   std::string encoded_client_secret = net::EscapeUrlEncodedData(
diff --git a/google_apis/gaia/gaia_constants.cc b/google_apis/gaia/gaia_constants.cc
index 1b1581d..60546bf 100644
--- a/google_apis/gaia/gaia_constants.cc
+++ b/google_apis/gaia/gaia_constants.cc
@@ -23,6 +23,11 @@ const char kSyncService[] = "chromiumsync";
 // Service name for remoting.
 const char kRemotingService[] = "chromoting";
 
+// OAuth scopes.
+const char kOAuth1LoginScope[] = "https://www.google.com/accounts/OAuthLogin";
+const char kOAuthWrapBridgeUserInfoScope[] =
+    "https://www.googleapis.com/auth/userinfo.email";
+
 // Service/scope names for device management (cloud-based policy) server.
 const char kDeviceManagementServiceOAuth[] =
     "https://www.googleapis.com/auth/chromeosdevicemanagement";
diff --git a/google_apis/gaia/gaia_constants.h b/google_apis/gaia/gaia_constants.h
index 3b45eee..406298c 100644
--- a/google_apis/gaia/gaia_constants.h
+++ b/google_apis/gaia/gaia_constants.h
@@ -18,6 +18,8 @@ extern const char kGaiaService[];  // uber token
 extern const char kPicasaService[];
 extern const char kSyncService[];
 extern const char kRemotingService[];
+extern const char kOAuth1LoginScope[];
+extern const char kOAuthWrapBridgeUserInfoScope[];
 extern const char kDeviceManagementServiceOAuth[];
 extern const char kAnyApiOAuth2Scope[];
 extern const char kChromeSyncOAuth2Scope[];
diff --git a/google_apis/gaia/gaia_switches.cc b/google_apis/gaia/gaia_switches.cc
index 46ed492..a5c4399e 100644
--- a/google_apis/gaia/gaia_switches.cc
+++ b/google_apis/gaia/gaia_switches.cc
@@ -10,9 +10,6 @@ const char kClientLoginToOAuth2Url[]        = "client-login-to-oauth2-url";
 const char kGaiaUrl[]                       = "gaia-url";
 const char kGoogleApisUrl[]                 = "google-apis-url";
 const char kLsoUrl[]                        = "lso-url";
-const char kOAuth1LoginScope[]              = "oauth1-login-scope";
-const char kOAuthWrapBridgeUserInfoScope[] =
-    "oauth-wrap-bridge-user-info-scope";
 const char kOAuth2ClientID[] = "oauth2-client-id";
 const char kOAuth2ClientSecret[] = "oauth2-client-secret";
 
diff --git a/google_apis/gaia/gaia_switches.h b/google_apis/gaia/gaia_switches.h
index 4fbefa3..15917c4 100644
--- a/google_apis/gaia/gaia_switches.h
+++ b/google_apis/gaia/gaia_switches.h
@@ -22,12 +22,6 @@ extern const char kGoogleApisUrl[];
 // "https://accounts.google.com".
 extern const char kLsoUrl[];
 
-// Specifies custom OAuth1 login scope for testing purposes.
-extern const char kOAuth1LoginScope[];
-
-// Overrides OAuth wrap bridge user info scope.
-extern const char kOAuthWrapBridgeUserInfoScope[];
-
 // Specifies custom OAuth2 client id for testing purposes.
 extern const char kOAuth2ClientID[];
 
diff --git a/google_apis/gaia/gaia_urls.cc b/google_apis/gaia/gaia_urls.cc
index ee7e4e3..0b44a91 100644
--- a/google_apis/gaia/gaia_urls.cc
+++ b/google_apis/gaia/gaia_urls.cc
@@ -32,11 +32,6 @@ 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_;
 }
diff --git a/google_apis/gaia/gaia_urls.h b/google_apis/gaia/gaia_urls.h
index 2ec6499..f96e89c 100644
--- a/google_apis/gaia/gaia_urls.h
+++ b/google_apis/gaia/gaia_urls.h
@@ -36,9 +36,6 @@ class GaiaUrls {
   const GURL& embedded_signin_url() const;
   const GURL& add_account_url() const;
 
-  const std::string& oauth1_login_scope() const;
-  const std::string& oauth_wrap_bridge_user_info_scope() const;
-
   const std::string& oauth2_chrome_client_id() const;
   const std::string& oauth2_chrome_client_secret() const;
   const GURL& client_login_to_oauth2_url() const;
@@ -80,9 +77,6 @@ class GaiaUrls {
   GURL embedded_signin_url_;
   GURL add_account_url_;
 
-  std::string oauth1_login_scope_;
-  std::string oauth_wrap_bridge_user_info_scope_;
-
   std::string oauth2_chrome_client_id_;
   std::string oauth2_chrome_client_secret_;
 
diff --git a/google_apis/gaia/ubertoken_fetcher.cc b/google_apis/gaia/ubertoken_fetcher.cc
index c32f2ec..da0ff27c 100644
--- a/google_apis/gaia/ubertoken_fetcher.cc
+++ b/google_apis/gaia/ubertoken_fetcher.cc
@@ -9,7 +9,6 @@
 #include "base/logging.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/google_service_auth_error.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 
@@ -31,7 +30,7 @@ UbertokenFetcher::~UbertokenFetcher() {
 
 void UbertokenFetcher::StartFetchingToken(const std::string& account_id) {
   OAuth2TokenService::ScopeSet scopes;
-  scopes.insert(GaiaUrls::GetInstance()->oauth1_login_scope());
+  scopes.insert(GaiaConstants::kOAuth1LoginScope);
   access_token_request_ =
       token_service_->StartRequest(account_id, scopes, this);
 }