Revert 50902 - New HTML Sync Setup UI....

chrome/browser/sync/profile_sync_service.cc

Index: chrome/browser/sync/profile_sync_service.cc
===================================================================
--- chrome/browser/sync/profile_sync_service.cc	(revision 51166)
+++ chrome/browser/sync/profile_sync_service.cc	(working copy)
@@ -194,7 +194,6 @@
     return;
   pref_service->RegisterInt64Pref(prefs::kSyncLastSyncedTime, 0);
   pref_service->RegisterBooleanPref(prefs::kSyncHasSetupCompleted, false);
-  pref_service->RegisterBooleanPref(prefs::kKeepEverythingSynced, false);
 
   // If you've never synced before, or if you're using Chrome OS, all datatypes
   // are on by default.
@@ -504,15 +503,6 @@
   }
 }
 
-void ProfileSyncService::ShowChooseDataTypes() {
-  if (WizardIsVisible()) {
-    wizard_.Focus();
-    return;
-  }
-
-  wizard_.Step(SyncSetupWizard::CHOOSE_DATA_TYPES);
-}
-
 SyncBackendHost::StatusSummary ProfileSyncService::QuerySyncStatusSummary() {
   if (backend_.get())
     return backend_->GetStatusSummary();
@@ -586,21 +576,10 @@
 }
 
 void ProfileSyncService::OnUserChoseDatatypes(bool sync_everything,
-    const syncable::ModelTypeSet& chosen_types) {
-  if (!backend_.get()) {
-    NOTREACHED();
-    return;
-  }
-  profile_->GetPrefs()->SetBoolean(prefs::kKeepEverythingSynced,
-      sync_everything);
-
-  ChangePreferredDataTypes(chosen_types);
-  profile_->GetPrefs()->ScheduleSavePersistentPrefs();
-
-  // If the backend has already started syncing, that's okay;
-  // SyncerThread::Start() checks if it's already running before starting.
-  backend_->StartSyncing();
-  // TODO(dantasse): pass the chosen_types parameter through to the backend
+    const syncable::ModelTypeSet& data_types) {
+  // TODO(dantasse): save sync_everything to prefs
+  // call StartSyncing(data_types)
+  // call ChangePreferredDataTypes(data_types)
 }
 
 void ProfileSyncService::OnUserCancelledDialog() {
@@ -733,7 +712,6 @@
       // TODO(sync): Less wizard, more toast.
       wizard_.Step(SyncSetupWizard::DONE);
       FOR_EACH_OBSERVER(Observer, observers_, OnStateChanged());
-
       break;
     }
     case NotificationType::SYNC_PASSPHRASE_REQUIRED: {