Revert of ChromeOS: Enable Gaia v2 API by default.

google_apis/gaia/gaia_urls.cc

 // 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.
 
 #include "google_apis/gaia/gaia_urls.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "google_apis/gaia/gaia_switches.h"
 #include "google_apis/google_api_keys.h"
 
 namespace {
 
 // Gaia service constants
 const char kDefaultGoogleUrl[] = "http://google.com";
 const char kDefaultGaiaUrl[] = "https://accounts.google.com";
 const char kDefaultGoogleApisBaseUrl[] = "https://www.googleapis.com";
 
 // API calls from accounts.google.com
 const char kClientLoginUrlSuffix[] = "ClientLogin";
 const char kServiceLoginUrlSuffix[] = "ServiceLogin";
-const char kEmbeddedSetupChromeOsUrlSuffixV1[] = "embedded/setup/chromeos";
-const char kEmbeddedSetupChromeOsUrlSuffixV2[] = "embedded/setup/v2/chromeos";
+const char kEmbeddedSetupChromeOsUrlSuffix[] = "embedded/setup/chromeos";
 const char kServiceLoginAuthUrlSuffix[] = "ServiceLoginAuth";
 const char kServiceLogoutUrlSuffix[] = "Logout";
 const char kIssueAuthTokenUrlSuffix[] = "IssueAuthToken";
 const char kGetUserInfoUrlSuffix[] = "GetUserInfo";
 const char kTokenAuthUrlSuffix[] = "TokenAuth";
 const char kMergeSessionUrlSuffix[] = "MergeSession";
 const char kOAuthGetAccessTokenUrlSuffix[] = "OAuthGetAccessToken";
 const char kOAuthWrapBridgeUrlSuffix[] = "OAuthWrapBridge";
 const char kOAuth1LoginUrlSuffix[] = "OAuthLogin";
 const char kOAuthRevokeTokenUrlSuffix[] = "AuthSubRevokeToken";
@@ skipping 56 matching lines @@
            (gaia_url_.has_port() ? ":" + gaia_url_.port() : ""));
 
   oauth2_chrome_client_id_ =
       google_apis::GetOAuth2ClientID(google_apis::CLIENT_MAIN);
   oauth2_chrome_client_secret_ =
       google_apis::GetOAuth2ClientSecret(google_apis::CLIENT_MAIN);
 
   // URLs from accounts.google.com.
   client_login_url_ = gaia_url_.Resolve(kClientLoginUrlSuffix);
   service_login_url_ = gaia_url_.Resolve(kServiceLoginUrlSuffix);
-  embedded_setup_chromeos_url_v1_ =
-      gaia_url_.Resolve(kEmbeddedSetupChromeOsUrlSuffixV1);
-  embedded_setup_chromeos_url_v2_ =
-      gaia_url_.Resolve(kEmbeddedSetupChromeOsUrlSuffixV2);
+  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);
   get_user_info_url_ = gaia_url_.Resolve(kGetUserInfoUrlSuffix);
   token_auth_url_ = gaia_url_.Resolve(kTokenAuthUrlSuffix);
   merge_session_url_ = gaia_url_.Resolve(kMergeSessionUrlSuffix);
   oauth_get_access_token_url_ =
       gaia_url_.Resolve(kOAuthGetAccessTokenUrlSuffix);
   oauth_wrap_bridge_url_ = gaia_url_.Resolve(kOAuthWrapBridgeUrlSuffix);
   oauth_revoke_token_url_ = gaia_url_.Resolve(kOAuthRevokeTokenUrlSuffix);
@@ skipping 41 matching lines @@
 }
 
 const GURL& GaiaUrls::client_login_url() const {
   return client_login_url_;
 }
 
 const GURL& GaiaUrls::service_login_url() const {
   return service_login_url_;
 }
 
-const GURL& GaiaUrls::embedded_setup_chromeos_url(unsigned version) const {
-  DCHECK_GT(version, 0U);
-  DCHECK_LE(version, 2U);
-  if (version == 2U)
-    return embedded_setup_chromeos_url_v2_;
-
-  return embedded_setup_chromeos_url_v1_;
+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_;
 }
 
 const GURL& GaiaUrls::service_logout_url() const {
   return service_logout_url_;
 }
@@ skipping 108 matching lines @@
   return source.empty()
       ? get_check_connection_info_url_
       : get_check_connection_info_url_.Resolve(
             base::StringPrintf("?source=%s", source.c_str()));
 }
 
 GURL GaiaUrls::signin_completed_continue_url() const {
   return
       GURL("chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik/success.html");
 }