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

chrome/browser/ui/chrome_pages.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/chrome_pages.h"
 
-#include "base/command_line.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/singleton_tabs.h"
+#include "chrome/browser/ui/sync/one_click_signin_helper.h"
 #include "chrome/browser/ui/webui/options/content_settings_handler.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/url_util.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/user_metrics.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "googleurl/src/gurl.h"
 
 using content::UserMetricsAction;
 
 namespace chrome {
 namespace {
@@ skipping 144 matching lines @@
 }
 
 void ShowSyncSetup(Browser* browser, SyncPromoUI::Source source) {
   Profile* original_profile = browser->profile()->GetOriginalProfile();
   ProfileSyncService* service =
       ProfileSyncServiceFactory::GetInstance()->GetForProfile(
           original_profile);
   if (service->HasSyncSetupCompleted()) {
     ShowSettings(browser);
   } else {
-    const bool use_web_flow = CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kUseWebBasedSigninFlow);
+    const bool use_web_flow = OneClickSigninHelper::UseWebBasedSigninFlow();
     const bool show_promo =
         SyncPromoUI::ShouldShowSyncPromo(browser->profile());
 
     LoginUIService* login = LoginUIServiceFactory::GetForProfile(
         original_profile);
     if (use_web_flow || (show_promo && login->current_login_ui() == NULL)) {
       NavigateToSingletonTab(browser, GURL(SyncPromoUI::GetSyncPromoURL(GURL(),
                                                             source,
                                                             false)));
     } else {
       login->ShowLoginUI(browser);
     }
   }
 }
 
 void ShowGaiaSignin(Browser* browser,
                     const std::string& service,
                     const GURL& continue_url) {
   GURL url(GaiaUrls::GetInstance()->service_login_url());
   url = chrome_common_net::AppendQueryParameter(url, "service", service);
   if (continue_url.is_valid())
     url = chrome_common_net::AppendQueryParameter(url,
                                                   "continue",
                                                   continue_url.spec());
   NavigateToSingletonTab(browser, url);
 }
 
 }  // namespace chrome