Revert 250967 "Revert of [sync]: add ManagedUserSigninManagerWra..."

trunk/src/chrome/browser/sync/profile_sync_service.h

Index: trunk/src/chrome/browser/sync/profile_sync_service.h
===================================================================
--- trunk/src/chrome/browser/sync/profile_sync_service.h	(revision 251113)
+++ trunk/src/chrome/browser/sync/profile_sync_service.h	(working copy)
@@ -48,6 +48,7 @@
 #include "sync/js/sync_js_controller.h"
 #include "url/gurl.h"
 
+class ManagedUserSigninManagerWrapper;
 class Profile;
 class ProfileOAuth2TokenService;
 class ProfileSyncComponentsFactory;
@@ -259,10 +260,10 @@
   // Sync server URL for dev channel users
   static const char* kDevServerUrl;
 
-  // Takes ownership of |factory|.
+  // Takes ownership of |factory| and |signin_wrapper|.
   ProfileSyncService(ProfileSyncComponentsFactory* factory,
                      Profile* profile,
-                     SigninManagerBase* signin,
+                     ManagedUserSigninManagerWrapper* signin_wrapper,
                      ProfileOAuth2TokenService* oauth2_token_service,
                      StartBehavior start_behavior);
   virtual ~ProfileSyncService();
@@ -641,7 +642,7 @@
 
   const GURL& sync_service_url() const { return sync_service_url_; }
   bool auto_start_enabled() const { return auto_start_enabled_; }
-  SigninManagerBase* signin() const { return signin_; }
+  SigninManagerBase* signin() const;
   bool setup_in_progress() const { return setup_in_progress_; }
 
   // Stops the sync backend and sets the flag for suppressing sync startup.
@@ -933,7 +934,7 @@
 
   // Encapsulates user signin - used to set/get the user's authenticated
   // email address.
-  SigninManagerBase* signin_;
+  scoped_ptr<ManagedUserSigninManagerWrapper> signin_;
 
   // Information describing an unrecoverable error.
   UnrecoverableErrorReason unrecoverable_error_reason_;