Revert r50774 as it introduces valgrind failures

TBR=dantasse@chromium.org
TEST=Valgrind bot goes green
BUG=none

Review URL: http://codereview.chromium.org/2827025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50820 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 13 deletions

diff --git a/chrome/browser/sync/sync_setup_wizard.h b/chrome/browser/sync/sync_setup_wizard.h
index acd4650..1e3c242 100644
--- a/chrome/browser/sync/sync_setup_wizard.h
+++ b/chrome/browser/sync/sync_setup_wizard.h
@@ -16,20 +16,10 @@ class SyncSetupWizard {
   enum State {
     // Show the Google Account login UI.
     GAIA_LOGIN = 0,
-    // A login attempt succeeded.  This will wait for an explicit transition
-    // (via Step) to the next state.
+    // A login attempt succeeded.  Depending on initial conditions, this may
+    // cause a transition to DONE, or to wait for an explicit transition (via
+    // Step) to the next state.
     GAIA_SUCCESS,
-    // Show the screen that lets you click either "Keep everything synced" or
-    // "Choose which data types to sync", and checkboxes for each data type.
-    CHOOSE_DATA_TYPES,
-    // Show the screen that lets you create a passphrase (if you've never set
-    // one up before).
-    CREATE_PASSPHRASE,
-    // Show the screen that lets you enter the passphrase (if you've set one up
-    // on another machine).
-    ENTER_PASSPHRASE,
-    // Show the screen that lets you reset your passphrase (if you forgot it).
-    RESET_PASSPHRASE,
     // The panic switch.  Something went terribly wrong during setup and we
     // can't recover.
     FATAL_ERROR,
@@ -72,6 +62,9 @@ class SyncSetupWizard {
 
   ProfileSyncService* service_;
 
+  // The use of ShowHtmlDialog and SyncSetupFlowContainer is disabled on Linux
+  // until BrowserShowHtmlDialog() is implemented.
+  // See: http://code.google.com/p/chromium/issues/detail?id=25260
   SyncSetupFlowContainer* flow_container_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncSetupWizard);