[SyncFS] Make SyncEngineInitializer run as a background task (3/3)

chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.h

Index: chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.h
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.h b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.h
index 39e8f229b801e2ed91c47a26448f722fe2dda05d..a1b86a40d35e75f2b0e9ef19102959b55b7782a7 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.h
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.h
@@ -64,7 +64,7 @@ class SyncEngineContext;
 //  - Populate database with the largest change ID, the sync-root folder and
 //    its contents.
 //
-class SyncEngineInitializer : public SequentialSyncTask {
+class SyncEngineInitializer : public SyncTask {
  public:
   SyncEngineInitializer(SyncEngineContext* sync_context,
                         base::SequencedTaskRunner* task_runner,
@@ -72,40 +72,40 @@ class SyncEngineInitializer : public SequentialSyncTask {
                         const base::FilePath& database_path,
                         leveldb::Env* env_override);
   virtual ~SyncEngineInitializer();
-  virtual void RunSequential(const SyncStatusCallback& callback) OVERRIDE;
+  virtual void Run(scoped_ptr<SyncTaskToken> token) OVERRIDE;
 
   scoped_ptr<MetadataDatabase> PassMetadataDatabase();
 
  private:
   typedef base::Callback<void(const SyncStatusCallback& callback)> Task;
 
-  void DidCreateMetadataDatabase(const SyncStatusCallback& callback,
+  void DidCreateMetadataDatabase(scoped_ptr<SyncTaskToken> token,
                                  SyncStatusCode status,
                                  scoped_ptr<MetadataDatabase> instance);
 
-  void GetAboutResource(const SyncStatusCallback& callback);
+  void GetAboutResource(scoped_ptr<SyncTaskToken> token);
   void DidGetAboutResource(
-      const SyncStatusCallback& callback,
+      scoped_ptr<SyncTaskToken> token,
       google_apis::GDataErrorCode error,
       scoped_ptr<google_apis::AboutResource> about_resource);
-  void FindSyncRoot(const SyncStatusCallback& callback);
-  void DidFindSyncRoot(const SyncStatusCallback& callback,
+  void FindSyncRoot(scoped_ptr<SyncTaskToken> token);
+  void DidFindSyncRoot(scoped_ptr<SyncTaskToken> token,
                        google_apis::GDataErrorCode error,
                        scoped_ptr<google_apis::ResourceList> resource_list);
-  void CreateSyncRoot(const SyncStatusCallback& callback);
-  void DidCreateSyncRoot(const SyncStatusCallback& callback,
+  void CreateSyncRoot(scoped_ptr<SyncTaskToken> token);
+  void DidCreateSyncRoot(scoped_ptr<SyncTaskToken> token,
                          google_apis::GDataErrorCode error,
                          scoped_ptr<google_apis::ResourceEntry> entry);
-  void DetachSyncRoot(const SyncStatusCallback& callback);
-  void DidDetachSyncRoot(const SyncStatusCallback& callback,
+  void DetachSyncRoot(scoped_ptr<SyncTaskToken> token);
+  void DidDetachSyncRoot(scoped_ptr<SyncTaskToken> token,
                          google_apis::GDataErrorCode error);
-  void ListAppRootFolders(const SyncStatusCallback& callback);
+  void ListAppRootFolders(scoped_ptr<SyncTaskToken> token);
   void DidListAppRootFolders(
-      const SyncStatusCallback& callback,
+      scoped_ptr<SyncTaskToken> token,
       google_apis::GDataErrorCode error,
       scoped_ptr<google_apis::ResourceList> resource_list);
-  void PopulateDatabase(const SyncStatusCallback& callback);
-  void DidPopulateDatabase(const SyncStatusCallback& callback,
+  void PopulateDatabase(scoped_ptr<SyncTaskToken> token);
+  void DidPopulateDatabase(scoped_ptr<SyncTaskToken> token,
                            SyncStatusCode status);
 
   SyncEngineContext* sync_context_;  // Not owned.