Setup from settings should allow configuration first

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 708 matching lines @@
       infobar_tab_helper->AddInfoBar(
           new OneClickInfoBarDelegateImpl(infobar_tab_helper, session_index_,
                                           email_, password_));
       break;
     case AUTO_ACCEPT_CONFIGURE:
       StartSync(browser, auto_accept_, session_index_, email_, password_,
                 OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST);
       break;
     case AUTO_ACCEPT_EXPLICIT:
       StartSync(browser, auto_accept_, session_index_, email_, password_,
-                OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS);
+                source_ == SyncPromoUI::SOURCE_SETTINGS ?
+                    OneClickSigninSyncStarter::SIGNIN_ONLY :
+                    OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS);
       break;
     case REJECTED_FOR_PROFILE:
       UMA_HISTOGRAM_ENUMERATION("AutoLogin.Reverse",
                                 one_click_signin::HISTOGRAM_REJECTED,
                                 one_click_signin::HISTOGRAM_MAX);
       break;
     default:
       NOTREACHED() << "Invalid auto_accept=" << auto_accept_;
       break;
   }
 
-  AutoAccept local_auto_accept = auto_accept_;
-  SyncPromoUI::Source local_source = source_;
+  // If this explicit sign in is not from settings page, show the NTP after
+  // sign in completes.  In the case of the settings page, it will get closed
+  // by SyncSetupHandler.
+  if (auto_accept_ == AUTO_ACCEPT_EXPLICIT &&
+      source_ != SyncPromoUI::SOURCE_SETTINGS) {
+    Profile* profile =
+        Profile::FromBrowserContext(contents->GetBrowserContext());
+    signin_tracker_.reset(new SigninTracker(profile, this));
+  }
 
   email_.clear();
   password_.clear();
   auto_accept_ = NO_AUTO_ACCEPT;
   source_ = SyncPromoUI::SOURCE_UNKNOWN;
-
-  // If this is an explicit sign in by the user, then redirect them to the
-  // NTP.
-  if (local_auto_accept == AUTO_ACCEPT_EXPLICIT) {
-    // If this is an explicit sign in from settings page, then close the
-    // tab.  Otherwise show the NTP after sign in completes.
-    if (local_source == SyncPromoUI::SOURCE_SETTINGS) {
-      contents->Close();
-    } else {
-      Profile* profile =
-          Profile::FromBrowserContext(contents->GetBrowserContext());
-      signin_tracker_.reset(new SigninTracker(profile, this));
-    }
-  }
-
-  // |this| may have been deleted due to the contents->Close() call above.
-  // No members should be accessed at this point.
 }
 
 void OneClickSigninHelper::GaiaCredentialsValid() {
   // Redirect to NTP with sign in bubble visible.
   content::WebContents* contents = web_contents();
   Profile* profile =
       Profile::FromBrowserContext(contents->GetBrowserContext());
   PrefService* pref_service = profile->GetPrefs();
   pref_service->SetBoolean(prefs::kSyncPromoShowNTPBubble, true);
 
   contents->GetController().LoadURL(GURL(chrome::kChromeUINewTabURL),
                                     content::Referrer(),
                                     content::PAGE_TRANSITION_AUTO_TOPLEVEL,
                                     std::string());
 }
 
 void OneClickSigninHelper::SigninFailed(const GoogleServiceAuthError& error) {
   signin_tracker_.reset();
 }
 
 void OneClickSigninHelper::SigninSuccess() {
   signin_tracker_.reset();
 }