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"
@@ skipping 53 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 205 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;
 }
+
+// static
+bool SyncPromoUI::UseWebBasedSigninFlow() {
+#if defined(ENABLE_ONE_CLICK_SIGNIN)
+  return !CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kUseClientLoginSigninFlow);
+#else
+  return false;
+#endif
+}