Revert of Sync: Support multiple setup UIs.

chrome/browser/ui/sync/one_click_signin_sync_starter.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_sync_starter.h"
 
 #include <stddef.h>
 
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 115 matching lines @@
   browser_ = browser;
 
   LoginUIServiceFactory::GetForProfile(profile_)->AddObserver(this);
 
   signin_tracker_ = SigninTrackerFactory::CreateForProfile(profile_, this);
 
   // Let the sync service know that setup is in progress so it doesn't start
   // syncing until the user has finished any configuration.
   ProfileSyncService* profile_sync_service = GetProfileSyncService();
   if (profile_sync_service)
-    sync_blocker_ = profile_sync_service->GetSetupInProgressHandle();
+    profile_sync_service->SetSetupInProgress(true);
 
   // Make sure the syncing is requested, otherwise the SigninManager
   // will not be able to complete successfully.
   sync_driver::SyncPrefs sync_prefs(profile_->GetPrefs());
   sync_prefs.SetSyncRequested(true);
 }
 
 void OneClickSigninSyncStarter::ConfirmSignin(const std::string& oauth_token) {
   DCHECK(!oauth_token.empty());
   SigninManager* signin = SigninManagerFactory::GetForProfile(profile_);
@@ skipping 461 matching lines @@
 }
 
 ProfileSyncService* OneClickSigninSyncStarter::GetProfileSyncService() {
   ProfileSyncService* service = NULL;
   if (profile_->IsSyncAllowed())
     service = ProfileSyncServiceFactory::GetForProfile(profile_);
   return service;
 }
 
 void OneClickSigninSyncStarter::FinishProfileSyncServiceSetup() {
-  sync_blocker_.reset();
+  ProfileSyncService* service =
+      ProfileSyncServiceFactory::GetForProfile(profile_);
+  if (service)
+    service->SetSetupInProgress(false);
 }
 
 void OneClickSigninSyncStarter::ShowSettingsPageInWebContents(
     content::WebContents* contents,
     const std::string& sub_page) {
   if (!continue_url_.is_empty()) {
     // The observer deletes itself once it's done.
     DCHECK(!sub_page.empty());
     new OneClickSigninSyncObserver(contents, continue_url_);
   }
@@ skipping 14 matching lines @@
                                             false /* user_gesture */);
 }
 
 void OneClickSigninSyncStarter::LoadContinueUrl() {
   web_contents()->GetController().LoadURL(
       continue_url_,
       content::Referrer(),
       ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
       std::string());
 }