Revert of [Sync] Componentize ProfileSyncComponentsFactoryImpl

components/browser_sync/browser/profile_sync_service.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_BROWSER_SYNC_BROWSER_PROFILE_SYNC_SERVICE_H_
 #define COMPONENTS_BROWSER_SYNC_BROWSER_PROFILE_SYNC_SERVICE_H_
 
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 212 matching lines @@
     UNKNOWN_ERROR,
   };
 
   enum BackendMode {
     IDLE,       // No backend.
     SYNC,       // Backend for syncing.
     BACKUP,     // Backend for backup.
     ROLLBACK    // Backend for rollback.
   };
 
+  // Takes ownership of |factory| and |signin_wrapper|.
   ProfileSyncService(
       scoped_ptr<sync_driver::SyncClient> sync_client,
       scoped_ptr<SigninManagerWrapper> signin_wrapper,
       ProfileOAuth2TokenService* oauth2_token_service,
       browser_sync::ProfileSyncServiceStartBehavior start_behavior,
       const syncer::NetworkTimeUpdateCallback& network_time_update_callback,
       base::FilePath base_directory,
       scoped_refptr<net::URLRequestContextGetter> url_request_context,
       std::string debug_identifier,
       version_info::Channel channel,
@@ skipping 697 matching lines @@
   base::Time next_token_request_time_;
 
   scoped_ptr<sync_driver::LocalDeviceInfoProvider> local_device_;
 
   // Locally owned SyncableService implementations.
   scoped_ptr<browser_sync::SessionsSyncManager> sessions_sync_manager_;
   scoped_ptr<sync_driver::DeviceInfoSyncService> device_info_sync_service_;
 
   scoped_ptr<syncer::NetworkResources> network_resources_;
 
-  browser_sync::ProfileSyncServiceStartBehavior start_behavior_;
   scoped_ptr<browser_sync::StartupController> startup_controller_;
 
   scoped_ptr<sync_driver::BackupRollbackController> backup_rollback_controller_;
 
   // Mode of current backend.
   BackendMode backend_mode_;
 
   // Whether backup is needed before sync starts.
   bool need_backup_;
 
@@ skipping 46 matching lines @@
   base::WeakPtrFactory<ProfileSyncService> startup_controller_weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
 };
 
 bool ShouldShowActionOnUI(
     const syncer::SyncProtocolError& error);
 
 
 #endif  // COMPONENTS_BROWSER_SYNC_BROWSER_PROFILE_SYNC_SERVICE_H_