[SyncFS] Split SyncEngine and SyncEngineContext

chrome/browser/sync_file_system/drive_backend/sync_engine_context.h

Index: chrome/browser/sync_file_system/drive_backend/sync_engine_context.h
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_context.h b/chrome/browser/sync_file_system/drive_backend/sync_engine_context.h
index 2a90d849e6404259a9a846db7b7621a3f85aa8d5..59d576ecee170e70cbb9ab3446e0872b326e8065 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine_context.h
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_context.h
@@ -6,15 +6,17 @@
 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_ENGINE_CONTEXT_H_
 
 #include "base/basictypes.h"
+#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 
 namespace base {
 class SequencedTaskRunner;
-}
+}  // namespace base

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

We usually don't add "// namespace xxx" for forward decl only namespace.
Could you drop this for consistency?

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

Done.

 
 namespace drive {
 class DriveServiceInterface;
 class DriveUploaderInterface;
-}
+}  // namespace drive
 
 namespace sync_file_system {
 
@@ -29,13 +31,28 @@ class SyncEngineContext {
   SyncEngineContext() {}
   ~SyncEngineContext() {}

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

I think these ctor and dtor need to be out-of-line now.
Then, we can revert new #include's, e.g. conflict_resolver.cc.

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

Done.

 
-  virtual drive::DriveServiceInterface* GetDriveService() = 0;
-  virtual drive::DriveUploaderInterface* GetDriveUploader() = 0;
-  virtual MetadataDatabase* GetMetadataDatabase() = 0;
-  virtual RemoteChangeProcessor* GetRemoteChangeProcessor() = 0;
-  virtual base::SequencedTaskRunner* GetBlockingTaskRunner() = 0;
+  drive::DriveServiceInterface* GetDriveService();
+  drive::DriveUploaderInterface* GetDriveUploader();
+  MetadataDatabase* GetMetadataDatabase();
+  RemoteChangeProcessor* GetRemoteChangeProcessor();
+  base::SequencedTaskRunner* GetBlockingTaskRunner();
+
+  // TODO(peria): Remove those setters.

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

Could you address this in this CL?

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

Done.
Setter for MetadataDatabase is needed in the product,
and setter RemoteChangeProcessor is needed in unit tests.

+  void SetMetadataDatabase(scoped_ptr<MetadataDatabase> metadata_database);
+  void SetDriveService(scoped_ptr<drive::DriveServiceInterface> drive_service);
+  void SetDriveUploader(scoped_ptr<drive::DriveUploaderInterface> uploader);
+  void SetRemoteChangeProcessor(RemoteChangeProcessor* remote_change_processor);
+  void SetSequencedTaskRunner(base::SequencedTaskRunner* runner);
+
+  scoped_ptr<MetadataDatabase> PassMetadataDatabase();
 
  private:
+  scoped_ptr<drive::DriveServiceInterface> drive_service_;
+  scoped_ptr<drive::DriveUploaderInterface> drive_uploader_;
+  scoped_ptr<MetadataDatabase> metadata_database_;
+  RemoteChangeProcessor* remote_change_processor_;
+  scoped_refptr<base::SequencedTaskRunner> task_runner_;
+
   DISALLOW_COPY_AND_ASSIGN(SyncEngineContext);
 };