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

chrome/browser/ui/webui/sync_promo/sync_promo_ui.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/webui/sync_promo/sync_promo_ui.h"
 
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
+#include "chrome/browser/ui/sync/one_click_signin_helper.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 #include "chrome/browser/ui/webui/options/core_options_handler.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_handler.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_trial.h"
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/net/url_util.h"
@@ skipping 33 matching lines @@
   if (brand.empty())
     return true;
 
   if (google_util::IsInternetCafeBrandCode(brand))
     return false;
 
   // Enable for both organic and distribution.
   return true;
 }
 
-bool UseWebBasedSigninFlow() {
-  const bool use_web_based_singin_flow =
-      CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kUseWebBasedSigninFlow);
-  return use_web_based_singin_flow;
-}
-
 // The Web UI data source for the sync promo page.
 class SyncPromoUIHTMLSource : public ChromeWebUIDataSource {
  public:
   explicit SyncPromoUIHTMLSource(content::WebUI* web_ui);
 
  private:
   ~SyncPromoUIHTMLSource() {}
   DISALLOW_COPY_AND_ASSIGN(SyncPromoUIHTMLSource);
 };
 
@@ skipping 130 matching lines @@
 }
 
 // static
 GURL SyncPromoUI::GetSyncPromoURL(const GURL& next_page,
                                   Source source,
                                   bool auto_close) {
   DCHECK_NE(SOURCE_UNKNOWN, source);
 
   std::string url_string;
 
-  if (UseWebBasedSigninFlow()) {
+  if (OneClickSigninHelper::UseWebBasedSigninFlow()) {
     // 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 GetSourceForSyncPromoURL() below.  This is used to know
@@ skipping 54 matching lines @@
 bool SyncPromoUI::GetAutoCloseForSyncPromoURL(const GURL& url) {
   std::string value;
   if (chrome_common_net::GetValueForKeyInQuery(
           url, kSyncPromoQueryKeyAutoClose, &value)) {
     int source = 0;
     base::StringToInt(value, &source);
     return (source == 1);
   }
   return false;
 }