Setup from settings should allow configuration first

chrome/browser/ui/sync/one_click_signin_helper_unittest.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 "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 30 matching lines @@
 
 // Explicit URLs are sign in URLs created by chrome for specific sign in access
 // points.  Implicit URLs are those to sign for some Google service, like gmail
 // or drive.  In former case, with a valid URL, we don't want to offer the
 // interstitial.  In all other cases we do.
 
 const char kImplicitURLString[] =
     "https://accounts.google.com/ServiceLogin"
     "?service=foo&continue=http://foo.google.com";
 
+bool UseWebBasedSigninFlow() {
+  const bool use_web_based_singin_flow =
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kUseWebBasedSigninFlow);

[Andrew T Wilson (Slow), 2012/12/03 13:19:02]

Why do we have a separate variable? Also, should be "signin" not "singin"
although forcing the user to sing to log in would be amusing :)

[Roger Tawa OOO till Jul 10th, 2012/12/03 19:08:28]

No need.  Too bad we're now loosing the singin'

+  return use_web_based_singin_flow;
+}
+
 class SigninManagerMock : public FakeSigninManager {
  public:
   explicit SigninManagerMock(Profile* profile)
       : FakeSigninManager(profile) {}
   MOCK_CONST_METHOD1(IsAllowedUsername, bool(const std::string& username));
 };
 
 class TestProfileIOData : public ProfileIOData {
  public:
   TestProfileIOData(bool is_incognito, PrefService* pref_service,
@@ skipping 284 matching lines @@
                                               true));
   EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents(), "", false));
 }
 
 TEST_F(OneClickSigninHelperTest, CanOfferFirstSetup) {
   CreateSigninManager(false, "");
 
   EXPECT_CALL(*signin_manager_, IsAllowedUsername(_)).
         WillRepeatedly(Return(true));
 
-   // Invoke OneClickTestProfileSyncService factory function and grab result.
-   OneClickTestProfileSyncService* sync =
-       static_cast<OneClickTestProfileSyncService*>(
-           ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse(
-               static_cast<Profile*>(browser_context()),
-               OneClickTestProfileSyncService::Build));
+  // Invoke OneClickTestProfileSyncService factory function and grab result.
+  OneClickTestProfileSyncService* sync =
+      static_cast<OneClickTestProfileSyncService*>(
+          ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse(
+              static_cast<Profile*>(browser_context()),
+              OneClickTestProfileSyncService::Build));
 
-   sync->set_first_setup_in_progress(true);
+  sync->set_first_setup_in_progress(true);
 
-   EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents(),
-                                               "foo@gmail.com",
-                                               true));
-   EXPECT_TRUE(OneClickSigninHelper::CanOffer(web_contents(),
-                                              "foo@gmail.com",
-                                              false));
+  EXPECT_EQ(UseWebBasedSigninFlow(),
+            OneClickSigninHelper::CanOffer(web_contents(),
+                                           "foo@gmail.com",
+                                           true));
+  EXPECT_TRUE(OneClickSigninHelper::CanOffer(web_contents(),
+                                             "foo@gmail.com",
+                                             false));
 }
 
 TEST_F(OneClickSigninHelperTest, CanOfferProfileConnected) {
   CreateSigninManager(false, "foo@gmail.com");
 
   EXPECT_CALL(*signin_manager_, IsAllowedUsername(_)).
       WillRepeatedly(Return(true));
 
   EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents(),
                                               "foo@gmail.com",
@@ skipping 175 matching lines @@
                 valid_gaia_url_, "", &request_, io_data.get()));
 }
 
 TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadNoSigninCookies) {
   AllowSigninCookies(false);
   scoped_ptr<TestProfileIOData> io_data(CreateTestProfileIOData(false));
   EXPECT_EQ(OneClickSigninHelper::DONT_OFFER,
             OneClickSigninHelper::CanOfferOnIOThreadImpl(
                 valid_gaia_url_, "", &request_, io_data.get()));
 }