Merge 176755

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 375 matching lines @@
                                             bool passphrase_failed) {
   ProfileSyncService* service = GetSyncService();
   if (!service->sync_initialized()) {
     // When user tries to setup sync while the sync backend is not initialized,
     // kick the sync backend and wait for it to be ready and show spinner until
     // the backend gets ready.
     retry_on_signin_failure_ = false;
 
     service->UnsuppressAndStart();
     DisplaySpinner();
+
     // To listen to the token available notifications, start SigninTracker.
-    signin_tracker_.reset(new SigninTracker(GetProfile(), this));
+    signin_tracker_.reset(
+        new SigninTracker(GetProfile(),
+                          this,
+                          SigninTracker::SERVICES_INITIALIZING));
     return;
   }
 
   // Should only be called if user is signed in, so no longer need our
   // SigninTracker.
   signin_tracker_.reset();
   configuring_sync_ = true;
   DCHECK(service->sync_initialized()) <<
       "Cannot configure sync until the sync backend is initialized";
 
@@ skipping 810 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;
 }