[SyncFS] Split SyncEngine and SyncEngineContext

chrome/browser/sync_file_system/drive_backend/sync_engine.h

 // Copyright 2013 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 CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_ENGINE_H_
 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_ENGINE_H_
 
 #include <set>
 #include <string>
 
@@ skipping 30 matching lines @@
 class LocalToRemoteSyncer;
 class MetadataDatabase;
 class RemoteToLocalSyncer;
 class SyncEngineInitializer;
 
 class SyncEngine : public RemoteFileSyncService,
                    public LocalChangeProcessor,
                    public SyncTaskManager::Client,
                    public drive::DriveNotificationObserver,
                    public drive::DriveServiceObserver,
-                   public net::NetworkChangeNotifier::NetworkChangeObserver,
-                   public SyncEngineContext {
+                   public net::NetworkChangeNotifier::NetworkChangeObserver {
  public:
   typedef Observer SyncServiceObserver;
 
   static scoped_ptr<SyncEngine> CreateForBrowserContext(
       content::BrowserContext* context);
   static void AppendDependsOnFactories(
       std::set<BrowserContextKeyedServiceFactory*>* factories);
 
   virtual ~SyncEngine();
 
@@ skipping 61 matching lines @@
   virtual void OnPushNotificationEnabled(bool enabled) OVERRIDE;
 
   // drive::DriveServiceObserver overrides.
   virtual void OnReadyToSendRequests() OVERRIDE;
   virtual void OnRefreshTokenInvalid() OVERRIDE;
 
   // net::NetworkChangeNotifier::NetworkChangeObserver overrides.
   virtual void OnNetworkChanged(
       net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
 
   // SyncEngineContext overrides.

[tzik, 2014/03/27 07:41:03]

drop this comment?

[peria, 2014/03/27 10:14:37]

Done.

-  virtual drive::DriveServiceInterface* GetDriveService() OVERRIDE;
-  virtual drive::DriveUploaderInterface* GetDriveUploader() OVERRIDE;
-  virtual MetadataDatabase* GetMetadataDatabase() OVERRIDE;
-  virtual RemoteChangeProcessor* GetRemoteChangeProcessor() OVERRIDE;
-  virtual base::SequencedTaskRunner* GetBlockingTaskRunner() OVERRIDE;
+  drive::DriveServiceInterface* GetDriveService();
+  drive::DriveUploaderInterface* GetDriveUploader();
+  MetadataDatabase* GetMetadataDatabase();
+  RemoteChangeProcessor* GetRemoteChangeProcessor();
+  base::SequencedTaskRunner* GetBlockingTaskRunner();
 
  private:
   friend class DriveBackendSyncTest;
   friend class SyncEngineTest;
 
   SyncEngine(const base::FilePath& base_dir,
              base::SequencedTaskRunner* task_runner,
              scoped_ptr<drive::DriveServiceInterface> drive_service,
              scoped_ptr<drive::DriveUploaderInterface> drive_uploader,
              drive::DriveNotificationManager* notification_manager,
@@ skipping 22 matching lines @@
 
   void UpdateServiceStateFromSyncStatusCode(SyncStatusCode state,
                                             bool used_network);
   void UpdateServiceState(RemoteServiceState state,
                           const std::string& description);
   void UpdateRegisteredApps();
 
   base::FilePath base_dir_;
   base::FilePath temporary_file_dir_;
 
-  scoped_refptr<base::SequencedTaskRunner> task_runner_;
   leveldb::Env* env_override_;
 
-  scoped_ptr<drive::DriveServiceInterface> drive_service_;
-  scoped_ptr<drive::DriveUploaderInterface> drive_uploader_;
-  scoped_ptr<MetadataDatabase> metadata_database_;
-
   // These external services are not owned by SyncEngine.
   // The owner of the SyncEngine is responsible for their lifetime.
   // I.e. the owner should declare the dependency explicitly by calling
   // KeyedService::DependsOn().
   drive::DriveNotificationManager* notification_manager_;
   ExtensionServiceInterface* extension_service_;
   SigninManagerBase* signin_manager_;
 
   ObserverList<SyncServiceObserver> service_observers_;
   ObserverList<FileStatusObserver> file_status_observers_;
   RemoteChangeProcessor* remote_change_processor_;
 
   RemoteServiceState service_state_;
 
   bool should_check_conflict_;
   bool should_check_remote_change_;
   bool listing_remote_changes_;
   base::TimeTicks time_to_check_changes_;
 
   bool sync_enabled_;
   ConflictResolutionPolicy default_conflict_resolution_policy_;
   bool network_available_;
 
   scoped_ptr<SyncTaskManager> task_manager_;
 
+  scoped_ptr<SyncEngineContext> context_;
   base::WeakPtrFactory<SyncEngine> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncEngine);
 };
 
 }  // namespace drive_backend
 }  // namespace sync_file_system
 
 #endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_ENGINE_H_