Disconnect one click sign in code. The code itself will be removed in followup

chrome/browser/signin/signin_promo.cc

 // Copyright 2013 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/browser/signin/signin_promo.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 24 matching lines @@
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/escape.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/url_util.h"
 #include "url/gurl.h"
 
 using content::WebContents;
 
 namespace {
 
-// Gaia cannot support about:blank as a continue URL, so using a hosted blank
-// page instead.
-const char kSignInLandingUrlPrefix[] =
-    "https://www.google.com/intl/%s/chrome/blank.html";
-
 // The maximum number of times we want to show the sign in promo at startup.
 const int kSignInPromoShowAtStartupMaximum = 10;
 
 // Forces the web based signin flow when set.
 bool g_force_web_based_signin_flow = false;
 
 // Checks we want to show the sign in promo for the given brand.
 bool AllowPromoAtStartupForCurrentBrand() {
   std::string brand;
   google_brand::GetBrand(&brand);
@@ skipping 94 matching lines @@
       prefs::kSignInPromoStartupCount);
   show_count++;
   profile->GetPrefs()->SetInteger(prefs::kSignInPromoStartupCount, show_count);
 }
 
 void SetUserSkippedPromo(Profile* profile) {
   profile->GetPrefs()->SetBoolean(prefs::kSignInPromoUserSkipped, true);
 }
 
 GURL GetLandingURL(const char* option, int value) {
-  std::string url;
-  if (switches::IsEnableWebBasedSignin()) {
-    const std::string& locale = g_browser_process->GetApplicationLocale();
-    url = base::StringPrintf(kSignInLandingUrlPrefix, locale.c_str());
-  } else {
-    url = base::StringPrintf(
-        "%s/success.html", extensions::kGaiaAuthExtensionOrigin);
-  }
-  base::StringAppendF(&url, "?%s=%d", option, value);
+  std::string url = base::StringPrintf("%s/success.html?%s=%d",
+                                       extensions::kGaiaAuthExtensionOrigin,
+                                       option,
+                                       value);
   return GURL(url);
 }
 
 GURL GetPromoURL(signin_metrics::Source source, bool auto_close) {
   return GetPromoURL(source, auto_close, false /* is_constrained */);
 }
 
 GURL GetPromoURL(signin_metrics::Source source,
                  bool auto_close,
                  bool is_constrained) {
   DCHECK_NE(signin_metrics::SOURCE_UNKNOWN, source);
 
-  if (!switches::IsEnableWebBasedSignin()) {
-    std::string url(chrome::kChromeUIChromeSigninURL);
-    base::StringAppendF(&url, "?%s=%d", kSignInPromoQueryKeySource, source);
-    if (auto_close)
-      base::StringAppendF(&url, "&%s=1", kSignInPromoQueryKeyAutoClose);
-    if (is_constrained)
-      base::StringAppendF(&url, "&%s=1", kSignInPromoQueryKeyConstrained);
-    return GURL(url);
-  }
-
-  // Build a Gaia-based URL that can be used to sign the user into chrome.
-  // There are required request parameters:
-  //
-  //  - tell Gaia which service the user is signing into.  In this case,
-  //    a chrome sign in uses the service "chromiumsync"
-  //  - provide a continue URL.  This is the URL that Gaia will redirect to
-  //    once the sign is complete.
-  //
-  // The continue URL includes a source parameter that can be extracted using
-  // the function GetSourceForSignInPromoURL() below.  This is used to know
-  // which of the chrome sign in access points was used to sign the user in.
-  // It is also parsed for the |auto_close| flag, which indicates that the tab
-  // must be closed after sync setup is successful.
-  // See OneClickSigninHelper for details.
-  std::string query_string = "?service=chromiumsync&sarp=1";
-
-  std::string continue_url = GetLandingURL(kSignInPromoQueryKeySource,
-                                           static_cast<int>(source)).spec();
+  std::string url(chrome::kChromeUIChromeSigninURL);
+  base::StringAppendF(&url, "?%s=%d", kSignInPromoQueryKeySource, source);
   if (auto_close)
-    base::StringAppendF(&continue_url, "&%s=1", kSignInPromoQueryKeyAutoClose);
-
-  base::StringAppendF(
-      &query_string,
-      "&%s=%s",
-      kSignInPromoQueryKeyContinue,
-      net::EscapeQueryParamValue(continue_url, false).c_str());
-
-  return GaiaUrls::GetInstance()->service_login_url().Resolve(query_string);
+    base::StringAppendF(&url, "&%s=1", kSignInPromoQueryKeyAutoClose);
+  if (is_constrained)
+    base::StringAppendF(&url, "&%s=1", kSignInPromoQueryKeyConstrained);
+  return GURL(url);
 }
 
 GURL GetReauthURL(Profile* profile, const std::string& account_id) {
   AccountTrackerService::AccountInfo info =
       AccountTrackerServiceFactory::GetForProfile(profile)->
           GetAccountInfo(account_id);
 
-  if (switches::IsEnableWebBasedSignin()) {
-    return net::AppendQueryParameter(
-        signin::GetPromoURL(signin_metrics::SOURCE_SETTINGS, true),
-        "Email",
-        account_id);
-  }
-
   signin_metrics::Source source = switches::IsNewAvatarMenu() ?
       signin_metrics::SOURCE_REAUTH : signin_metrics::SOURCE_SETTINGS;
 
   GURL url = signin::GetPromoURL(
       source, true /* auto_close */,
       switches::IsNewAvatarMenu() /* is_constrained */);
   url = net::AppendQueryParameter(url, "email", info.email);
   url = net::AppendQueryParameter(url, "validateEmail", "1");
   return net::AppendQueryParameter(url, "readOnlyEmail", "1");
 }
 
 GURL GetNextPageURLForPromoURL(const GURL& url) {
   std::string value;
   if (net::GetValueForKeyInQuery(url, kSignInPromoQueryKeyContinue, &value)) {
     GURL continue_url = GURL(value);
     if (continue_url.is_valid())
       return continue_url;
   }
 
   return GURL();
 }
 
 GURL GetSigninPartitionURL() {
-  return GURL(switches::IsEnableWebviewBasedSignin() ?
-      "chrome-guest://chrome-signin/?" :
-      chrome::kChromeUIChromeSigninURL);
+  return GURL("chrome-guest://chrome-signin/?");
 }
 
 signin_metrics::Source GetSourceForPromoURL(const GURL& url) {
   std::string value;
   if (net::GetValueForKeyInQuery(url, kSignInPromoQueryKeySource, &value)) {
     int source = 0;
     if (base::StringToInt(value, &source) &&
         source >= signin_metrics::SOURCE_START_PAGE &&
         source < signin_metrics::SOURCE_UNKNOWN) {
       return static_cast<signin_metrics::Source>(source);
@@ skipping 16 matching lines @@
   std::string value;
   if (net::GetValueForKeyInQuery(
           url, kSignInPromoQueryKeyShowAccountManagement, &value)) {
     int enabled = 0;
     if (base::StringToInt(value, &enabled) && enabled == 1)
       return true;
   }
   return false;
 }
 
-bool IsContinueUrlForWebBasedSigninFlow(const GURL& url) {
-  GURL::Replacements replacements;
-  replacements.ClearQuery();
-  const std::string& locale = g_browser_process->GetApplicationLocale();
-  GURL continue_url =
-      GURL(base::StringPrintf(kSignInLandingUrlPrefix, locale.c_str()));
-  return (
-      google_util::IsGoogleDomainUrl(
-          url,
-          google_util::ALLOW_SUBDOMAIN,
-          google_util::DISALLOW_NON_STANDARD_PORTS) &&
-      url.ReplaceComponents(replacements).path() ==
-        continue_url.ReplaceComponents(replacements).path());
-}
-
 void ForceWebBasedSigninFlowForTesting(bool force) {
   g_force_web_based_signin_flow = force;
 }
 
 void RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterIntegerPref(
       prefs::kSignInPromoStartupCount,
       0,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kSignInPromoUserSkipped,
       false,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kSignInPromoShowOnFirstRunAllowed,
       true,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kSignInPromoShowNTPBubble,
       false,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 }  // namespace signin