[sync] Fix incorrectly grayed out "Disconnect your Google Account..." button

chrome/browser/ui/webui/sync_setup_handler.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_setup_handler.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 1150 matching lines @@
       }
 
       // If the user clicked "Cancel" while setting up sync, disable sync
       // because we don't want the sync backend to remain in the initialized
       // state. Note: In order to disable sync across restarts on Chrome OS, we
       // must call OnStopSyncingPermanently(), which suppresses sync startup in
       // addition to disabling it.
       if (sync_service) {
         DVLOG(1) << "Sync setup aborted by user action";
         sync_service->OnStopSyncingPermanently();
-        sync_service->SetSetupInProgress(false);
       }
     }
 
 #if !defined(OS_CHROMEOS)
     // Let the various services know that we're no longer active.
     if (SyncPromoUI::UseWebBasedSigninFlow())
       CloseGaiaSigninPage();
 #endif
 
     GetLoginUIService()->LoginUIClosed(this);
   }
 
+  // Alert the sync service anytime the sync setup dialog is closed. This can
+  // happen due to the user clicking the OK or Cancel button, or due to the
+  // dialog being closed by virtue of sync being disabled in the background.
+  if (sync_service)
+    sync_service->SetSetupInProgress(false);
+
 #if !defined(OS_CHROMEOS)
   // Reset the attempted email address and error, otherwise the sync setup
   // overlay in the settings page will stay in whatever error state it was last
   // when it is reopened.
   last_attempted_user_email_.clear();
   last_signin_error_ = GoogleServiceAuthError::AuthErrorNone();
 #endif
 
   configuring_sync_ = false;
   signin_tracker_.reset();
@@ skipping 179 matching lines @@
   return LoginUIServiceFactory::GetForProfile(GetProfile());
 }
 
 void SyncSetupHandler::CloseOverlay() {
   // Stop a timer to handle timeout in waiting for sync setup.
   backend_start_timer_.reset();
 
   CloseSyncSetup();
   web_ui()->CallJavascriptFunction("OptionsPage.closeOverlay");
 }