Revert 221035 "Revert 219146 "[sync] Force re-auth during sync s..."

trunk/src/chrome/browser/ui/sync/one_click_signin_helper.cc

Index: trunk/src/chrome/browser/ui/sync/one_click_signin_helper.cc
===================================================================
--- trunk/src/chrome/browser/ui/sync/one_click_signin_helper.cc	(revision 221737)
+++ trunk/src/chrome/browser/ui/sync/one_click_signin_helper.cc	(working copy)
@@ -1251,11 +1251,14 @@
       //   default settings.
       // - If sign in was initiated from the settings page for first time sync
       //   set up, show the advanced sync settings dialog.
-      // - If sign in was initiated from the settings page due to a re-auth,
-      //   simply navigate back to the settings page.
+      // - If sign in was initiated from the settings page due to a re-auth when
+      //   sync was already setup, simply navigate back to the settings page.
+      ProfileSyncService* sync_service =
+          ProfileSyncServiceFactory::GetForProfile(profile);
       OneClickSigninSyncStarter::StartSyncMode start_mode =
           source_ == signin::SOURCE_SETTINGS ?
-              SigninGlobalError::GetForProfile(profile)->HasMenuItem() ?
+              (SigninGlobalError::GetForProfile(profile)->HasMenuItem() &&
+               sync_service && sync_service->HasSyncSetupCompleted()) ?
                   OneClickSigninSyncStarter::SHOW_SETTINGS_WITHOUT_CONFIGURE :
                   OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST :
               OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS;