Enable web-based sign in flow by default. Can use command line argument

chrome/browser/ui/sync/one_click_signin_helper.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 "chrome/browser/ui/sync/one_click_signin_helper.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/metrics/histogram.h"
@@ skipping 91 matching lines @@
       break;
     default:
       NOTREACHED() << "Invalid auto_accept: " << auto_accept;
       break;
   }
 
   UMA_HISTOGRAM_ENUMERATION("AutoLogin.Reverse", action,
                             one_click_signin::HISTOGRAM_MAX);
 }
 
-bool UseWebBasedSigninFlow() {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kUseWebBasedSigninFlow);
-}
-
 // Determines the source of the sign in.  Its either one of the known sign in
 // access point (first run, NTP, menu, settings) or its an implicit sign in
 // via another Google property.  In the former case, "service" is also
 // checked to make sure its "chromiumsync".
 SyncPromoUI::Source GetSigninSource(const GURL& url) {
   std::string value;
   chrome_common_net::GetValueForKeyInQuery(url, "service", &value);
   bool is_explicit_signin = value == "chromiumsync";
 
   chrome_common_net::GetValueForKeyInQuery(url, "continue", &value);
@@ skipping 311 matching lines @@
       const ListValue* rejected_emails = profile->GetPrefs()->GetList(
           prefs::kReverseAutologinRejectedEmailList);
       if (!rejected_emails->empty()) {
         base::ListValue::const_iterator iter = rejected_emails->Find(
             base::StringValue(email));
         if (iter != rejected_emails->end())
           return false;
       }
     }
 
-    if (!UseWebBasedSigninFlow()) {
+    if (!SyncPromoUI::UseWebBasedSigninFlow()) {
       // If we're about to show a one-click infobar but the user has started
       // a concurrent signin flow (perhaps via the promo), we may not have yet
       // established an authenticated username but we still shouldn't move
       // forward with two simultaneous signin processes.  This is a bit
       // contentious as the one-click flow is a much smoother flow from the user
       // perspective, but it's much more difficult to hijack the other flow from
       // here as it is to bail.
       ProfileSyncService* service =
           ProfileSyncServiceFactory::GetForProfile(profile);
       if (!service)
@@ skipping 20 matching lines @@
     const GURL& url,
     const std::string& referrer,
     base::SupportsUserData* request,
     ProfileIOData* io_data) {
   if (!gaia::IsGaiaSignonRealm(url.GetOrigin()))
     return IGNORE_REQUEST;
 
   if (!io_data)
     return DONT_OFFER;
 
-  if (!UseWebBasedSigninFlow())
+  if (!SyncPromoUI::UseWebBasedSigninFlow())
     return DONT_OFFER;
 
   // Don't offer if the source is known, as that means it's an explicit sign
   // in request.
   if (GetSigninSource(url) != SyncPromoUI::SOURCE_UNKNOWN ||
       GetSigninSource(GURL(referrer)) != SyncPromoUI::SOURCE_UNKNOWN) {
     return DONT_OFFER;
   }
 
   if (!ProfileSyncService::IsSyncEnabled())
@@ skipping 70 matching lines @@
   std::string google_accounts_signin_value;
   request->GetResponseHeaderByName("Google-Chrome-SignIn",
                                    &google_chrome_signin_value);
   request->GetResponseHeaderByName("Google-Accounts-SignIn",
                                    &google_accounts_signin_value);
 
   VLOG(1) << "OneClickSigninHelper::ShowInfoBarIfPossible:"
           << " g-a-s='" << google_accounts_signin_value << "'"
           << " g-c-s='" << google_chrome_signin_value << "'";
 
-  if (!UseWebBasedSigninFlow() && google_accounts_signin_value.empty())
+  if (!SyncPromoUI::UseWebBasedSigninFlow() &&
+      google_accounts_signin_value.empty()) {
     return;
+  }
 
   if (!gaia::IsGaiaSignonRealm(request->original_url().GetOrigin()))
     return;
 
   // Parse Google-Accounts-SignIn.
   std::vector<std::pair<std::string, std::string> > pairs;
   base::SplitStringIntoKeyValuePairs(google_accounts_signin_value, '=', ',',
                                      &pairs);
   std::string session_index;
   std::string email;
   for (size_t i = 0; i < pairs.size(); ++i) {
     const std::pair<std::string, std::string>& pair = pairs[i];
     const std::string& key = pair.first;
     const std::string& value = pair.second;
     if (key == "email") {
       TrimString(value, "\"", &email);
     } else if (key == "sessionindex") {
       session_index = value;
     }
   }
 
   // Later in the chain of this request, we'll need to check the email address
   // in the IO thread (see CanOfferOnIOThread).  So save the email address as
   // user data on the request (only for web-based flow).
-  if (UseWebBasedSigninFlow() && !email.empty())
+  if (SyncPromoUI::UseWebBasedSigninFlow() && !email.empty())
     OneClickSigninRequestUserData::AssociateWithRequest(request, email);
 
   VLOG(1) << "OneClickSigninHelper::ShowInfoBarIfPossible:"
           << " email=" << email
           << " sessionindex=" << session_index;
 
   // Parse Google-Chrome-SignIn.
   AutoAccept auto_accept = NO_AUTO_ACCEPT;
   SyncPromoUI::Source source = SyncPromoUI::SOURCE_UNKNOWN;
-  if (UseWebBasedSigninFlow()) {
+  if (SyncPromoUI::UseWebBasedSigninFlow()) {
     std::vector<std::string> tokens;
     base::SplitString(google_chrome_signin_value, ',', &tokens);
     for (size_t i = 0; i < tokens.size(); ++i) {
       const std::string& token = tokens[i];
       if (token == "accepted") {
         auto_accept = AUTO_ACCEPT;
       } else if (token == "configure") {
         auto_accept = AUTO_ACCEPT_CONFIGURE;
       } else if (token == "rejected-for-profile") {
         auto_accept = REJECTED_FOR_PROFILE;
@@ skipping 203 matching lines @@
         break;
     }
   }
 
   RedirectToNTP();
 }
 
 void OneClickSigninHelper::SigninSuccess() {
   RedirectToNTP();
 }