[sync] Make SetSetupInProgress kick sync engine when needed

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 844 matching lines @@
             ProfileSyncService::CANCEL_DURING_CONFIGURE);
       } else {
         ProfileSyncService::SyncEvent(
             ProfileSyncService::CANCEL_FROM_SIGNON_WITHOUT_AUTH);
       }
     }
 
     // Let the various services know that we're no longer active.
     GetLoginUIService()->LoginUIClosed(this);
     if (sync_service)
-      sync_service->set_setup_in_progress(false);
+      sync_service->SetSetupInProgress(false);
 
     // Make sure user isn't left half-logged-in (signed in, but without sync
     // started up). If the user hasn't finished setting up sync, then sign out
     // and shut down sync.
     if (sync_service && !sync_service->HasSyncSetupCompleted()) {
       DVLOG(1) << "Signin aborted by user action";
       // Calling DisableForUser() will also sign the user out on desktop
       // platforms (platforms without sync auto-start enabled).
       sync_service->DisableForUser();
 
@@ skipping 29 matching lines @@
 
   // If the wizard is already visible, just focus that one.
   if (FocusExistingWizardIfPresent()) {
     if (!IsActiveLogin())
       CloseOverlay();
     return;
   }
 
   // Notify services that we are now active.
   GetLoginUIService()->SetLoginUI(this);
-  service->set_setup_in_progress(true);
+  service->SetSetupInProgress(true);
 
   // There are several different UI flows that can bring the user here:
   // 1) Signin promo (passes force_login=true)
   // 2) Normal signin through options page (IsSyncEnabledAndLoggedIn() will
   //    return false).
   // 3) Previously working credentials have expired
   //    (service->GetAuthError() != NONE).
   // 4) User is already signed in, but App Notifications needs to force another
   //    login so it can fetch an oauth token (passes force_login=true)
   // 5) User clicks [Advanced Settings] button on options page while already
@@ skipping 22 matching lines @@
 
 void SyncSetupHandler::PrepareConfigDialog() {
   // On Chrome OS user is always logged in. Instead of showing login dialog,
   // show spinner until the backend gets ready to configure sync.
   ProfileSyncService* service = GetSyncService();
   if (!service->sync_initialized()) {
     // To listen to the token available notifications, start SigninTracker.
     signin_tracker_.reset(
         new SigninTracker(GetProfile(), this,
                           SigninTracker::SERVICES_INITIALIZING));
-    service->set_setup_in_progress(true);
+    service->SetSetupInProgress(true);
     service->UnsuppressAndStart();
     DisplaySpinner();
   } else {
     DisplayConfigureSync(true, false);
   }
 }
 
 void SyncSetupHandler::FocusUI() {
   DCHECK(IsActiveLogin());
   WebContents* web_contents = web_ui()->GetWebContents();
@@ skipping 52 matching lines @@
     if (i != current_profile_index && AreUserNamesEqual(
         cache.GetUserNameOfProfileAtIndex(i), username_utf16)) {
       *error_message = l10n_util::GetStringUTF16(
           IDS_SYNC_USER_NAME_IN_USE_ERROR);
       return false;
     }
   }
 
   return true;
 }