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

chrome/browser/sync/profile_sync_service.h

Index: chrome/browser/sync/profile_sync_service.h
===================================================================
--- chrome/browser/sync/profile_sync_service.h	(revision 51166)
+++ chrome/browser/sync/profile_sync_service.h	(working copy)
@@ -108,8 +108,7 @@
     CANCEL_FROM_SIGNON_WITHOUT_AUTH = 10,   // Cancelled before submitting
                                             // username and password.
     CANCEL_DURING_SIGNON = 11,              // Cancelled after auth.
-    CANCEL_FROM_CHOOSE_DATA_TYPES = 12,     // Cancelled before choosing data
-                                            // types and clicking OK.
+
     // Events resulting in the stoppage of sync service.
     STOP_FROM_OPTIONS = 20,  // Sync was stopped from Wrench->Options.
 
@@ -164,11 +163,11 @@
 
   // Called when a user chooses which data types to sync as part of the sync
   // setup wizard.  |sync_everything| represents whether they chose the
-  // "keep everything synced" option; if true, |chosen_types| will be ignored
-  // and all data types will be synced.  |sync_everything| means "sync all
-  // current and future data types."
+  // "keep everything synced" option; if true, data_types will be ignored and
+  // all data types will be synced.  |sync_everything| means "sync all current
+  // and future data types."
   virtual void OnUserChoseDatatypes(bool sync_everything,
-      const syncable::ModelTypeSet& chosen_types);
+      const syncable::ModelTypeSet& data_types);
 
   // Called when a user cancels any setup dialog (login, etc).
   virtual void OnUserCancelledDialog();
@@ -196,8 +195,6 @@
   }
   void ShowLoginDialog();
 
-  void ShowChooseDataTypes();
-
   // Pretty-printed strings for a given StatusSummary.
   static std::wstring BuildSyncStatusSummaryText(
       const browser_sync::SyncBackendHost::StatusSummary& summary);