Revert 111270 - Part 1 of work to do user sign in based on OAuth2:

chrome/common/net/gaia/gaia_urls.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/common/net/gaia/gaia_urls.h"
 
 #include "base/command_line.h"
 #include "chrome/common/chrome_switches.h"
 
 namespace {
 
 const char kDefaultGaiaBaseUrl[] = "www.google.com";
 
 const char kCaptchaUrlPrefixSuffix[] = "/accounts/";
 const char kClientLoginUrlSuffix[] = "/accounts/ClientLogin";
 const char kIssueAuthTokenUrlSuffix[] = "/accounts/IssueAuthToken";
 const char kGetUserInfoUrlSuffix[] = "/accounts/GetUserInfo";
 const char kTokenAuthUrlSuffix[] = "/accounts/TokenAuth";
 const char kMergeSessionUrlSuffix[] = "/accounts/MergeSession";
 
 const char kGetOAuthTokenUrlSuffix[] = "/accounts/o8/GetOAuthToken";
 const char kOAuthGetAccessTokenUrlSuffix[] = "/accounts/OAuthGetAccessToken";
 const char kOAuthWrapBridgeUrlSuffix[] = "/accounts/OAuthWrapBridge";
 const char kOAuth1LoginUrlSuffix[] = "/accounts/OAuthLogin";
 const char kOAuthRevokeTokenUrlSuffix[] = "/accounts/AuthSubRevokeToken";
 
-// OAuth2 client id for Google Chrome which is registered as an
-// installed application.
-static const char kOAuth2ChromeClientId[] =
-    "77185425430.apps.googleusercontent.com";
-// For an installed application, client secret is not really a secret since
-// it is expected to be embeeded in the application.
-// See documentation at
-// http://code.google.com/apis/accounts/docs/OAuth2InstalledApp.html
-static const char kOAuth2ChromeClientSecret[] =
-    "OTJgUOQcT7lO7GsGZq2G4IlT";
-const char kClientLoginToOAuth2Url[] =
-    "https://accounts.google.com/o/oauth2/programmatic_auth";
-const char kOAuth2TokenUrl[] =
-    "https://accounts.google.com/o/oauth2/token";
 }  // namespacce
 
 GaiaUrls* GaiaUrls::GetInstance() {
   return Singleton<GaiaUrls>::get();
 }
 
 GaiaUrls::GaiaUrls() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   std::string host_base;
   if (command_line->HasSwitch(switches::kGaiaHost)) {
@@ skipping 17 matching lines @@
   oauth_revoke_token_url_ = gaia_origin_url_ + kOAuthRevokeTokenUrlSuffix;
   oauth1_login_url_ = gaia_origin_url_ + kOAuth1LoginUrlSuffix;
 
   // TODO(joaodasilva): these aren't configurable for now, but are managed here
   // so that users of Gaia URLs don't have to use static constants.
   // http://crbug.com/97126
   oauth1_login_scope_ = "https://www.google.com/accounts/OAuthLogin";
   oauth_user_info_url_ = "https://www.googleapis.com/oauth2/v1/userinfo";
   oauth_wrap_bridge_user_info_scope_ =
       "https://www.googleapis.com/auth/userinfo.email";
-
-  oauth2_chrome_client_id_ = kOAuth2ChromeClientId;
-  oauth2_chrome_client_secret_ = kOAuth2ChromeClientSecret;
-  client_login_to_oauth2_url_ = kClientLoginToOAuth2Url;
-  oauth2_token_url_ = kOAuth2TokenUrl;
 }
 
 GaiaUrls::~GaiaUrls() {
 }
 
 const std::string& GaiaUrls::captcha_url_prefix() {
   return captcha_url_prefix_;
 }
 
 const std::string& GaiaUrls::gaia_origin_url() {
@@ skipping 44 matching lines @@
   return oauth1_login_url_;
 }
 
 const std::string& GaiaUrls::oauth1_login_scope() {
   return oauth1_login_scope_;
 }
 
 const std::string& GaiaUrls::oauth_wrap_bridge_user_info_scope() {
   return oauth_wrap_bridge_user_info_scope_;
 }
-
-const std::string& GaiaUrls::oauth2_chrome_client_id() {
-  return oauth2_chrome_client_id_;
-}
-
-const std::string& GaiaUrls::oauth2_chrome_client_secret() {
-  return oauth2_chrome_client_secret_;
-}
-
-const std::string& GaiaUrls::client_login_to_oauth2_url() {
-  return client_login_to_oauth2_url_;
-}
-
-const std::string& GaiaUrls::oauth2_token_url() {
-  return oauth2_token_url_;
-}