Fix some problems with the ENTER_PASSPHRASE state in sync setup....

chrome/browser/sync/profile_sync_service.h

Index: chrome/browser/sync/profile_sync_service.h
===================================================================
--- chrome/browser/sync/profile_sync_service.h	(revision 62569)
+++ chrome/browser/sync/profile_sync_service.h	(working copy)
@@ -222,7 +222,7 @@
     return wizard_.IsVisible();
   }
   virtual void ShowLoginDialog(gfx::NativeWindow parent_window);
-  void ShowChooseDataTypes(gfx::NativeWindow parent_window);
+  void ShowConfigure(gfx::NativeWindow parent_window);
 
   // Pretty-printed strings for a given StatusSummary.
   static std::string BuildSyncStatusSummaryText(
@@ -248,6 +248,10 @@
     return is_auth_in_progress_;
   }
 
+  bool observed_passphrase_required() const {
+    return observed_passphrase_required_;
+  }
+
   // A timestamp marking the last time the service observed a transition from
   // the SYNCING state to the READY state. Note that this does not reflect the
   // last time we polled the server to see if there were any changes; the
@@ -394,6 +398,10 @@
   // Cache of the last name the client attempted to authenticate.
   std::string last_attempted_user_email_;
 
+  // Whether we have seen a SYNC_PASSPHRASE_REQUIRED since initializing the
+  // backend, telling us that it is safe to send a passphrase down ASAP.
+  bool observed_passphrase_required_;
+
  private:
   friend class ProfileSyncServiceTest;
   friend class ProfileSyncServicePasswordTest;
@@ -496,10 +504,6 @@
   // credentials were provided.
   std::string cached_passphrase_;
 
-  // Whether we have seen a SYNC_PASSPHRASE_REQUIRED since initializing the
-  // backend, telling us that it is safe to send a passphrase down ASAP.
-  bool observed_passphrase_required_;
-
   // Keep track of where we are in a server clear operation
   ClearServerDataState clear_server_data_state_;