Add to be fetched files instead of DriveMetadataStore.batch_sync_origins_

chrome/browser/sync_file_system/drive_file_sync_service.cc

Index: chrome/browser/sync_file_system/drive_file_sync_service.cc
diff --git a/chrome/browser/sync_file_system/drive_file_sync_service.cc b/chrome/browser/sync_file_system/drive_file_sync_service.cc
index c99ed695178baf6fcd85152b87a7b4db0ba25cbf..b86a56060db75a1828e61845d23dd1c1eab8ac4d 100644
--- a/chrome/browser/sync_file_system/drive_file_sync_service.cc
+++ b/chrome/browser/sync_file_system/drive_file_sync_service.cc
@@ -434,15 +434,6 @@ void DriveFileSyncService::DidInitializeMetadataStore(
 
   largest_fetched_changestamp_ = metadata_store_->GetLargestChangeStamp();
 
-  // Mark all the batch sync origins as 'pending' so that we can start
-  // batch sync when we're ready.
-  for (std::map<GURL, std::string>::const_iterator itr =
-           metadata_store_->batch_sync_origins().begin();
-       itr != metadata_store_->batch_sync_origins().end();
-       ++itr) {
-    pending_batch_sync_origins_.insert(itr->first);
-  }
-
   DriveMetadataStore::URLAndDriveMetadataList to_be_fetched_files;
   status = metadata_store_->GetToBeFetchedFiles(&to_be_fetched_files);
   DCHECK_EQ(SYNC_STATUS_OK, status);
@@ -710,11 +701,7 @@ void DriveFileSyncService::UpdateRegisteredOrigins() {
 void DriveFileSyncService::StartBatchSync(
     const SyncStatusCallback& callback) {
   DCHECK(GetCurrentState() == REMOTE_SERVICE_OK || may_have_unfetched_changes_);
-
-  if (pending_batch_sync_origins_.empty()) {
-    callback.Run(SYNC_STATUS_OK);
-    return;
-  }
+  DCHECK(!pending_batch_sync_origins_.empty());
 
   GURL origin = *pending_batch_sync_origins_.begin();
   pending_batch_sync_origins_.erase(pending_batch_sync_origins_.begin());
@@ -757,6 +744,8 @@ void DriveFileSyncService::DidGetDriveDirectoryForOrigin(
   }
 
   // Add this origin to batch sync origin if it hasn't been already.
+  // TODO(calvinlo): Added files to file metadata mapping, this can be removed
+  // next when batch_sync_origins is removed from DriveMetadataStore.
   if (!metadata_store_->IsKnownOrigin(origin)) {
     metadata_store_->AddBatchSyncOrigin(origin, resource_id);

[tzik, 2013/05/16 12:11:34]

could you move this around line 845?
I want register the origin as a incremental sync origin from first.

[calvinlo, 2013/05/17 04:40:58]

Done. As discussed, in order to facilitate this change I have updated
pending_batch_sync_origins_ to be a map so it can also hold the resource_id.

     pending_batch_sync_origins_.insert(origin);
@@ -823,8 +812,22 @@ void DriveFileSyncService::DidGetDirectoryContentForBatchSync(
   typedef ScopedVector<google_apis::ResourceEntry>::const_iterator iterator;
   for (iterator itr = feed->entries().begin();
        itr != feed->entries().end(); ++itr) {
-    AppendRemoteChange(origin, **itr, largest_changestamp,
+    const google_apis::ResourceEntry& entry = **itr;
+    AppendRemoteChange(origin, entry, largest_changestamp,
                        RemoteChangeHandler::REMOTE_SYNC_TYPE_BATCH);
+
+    // Save to be fetched file to DB for restore in case of crash.
+    DriveMetadata metadata;
+    metadata.set_resource_id(entry.resource_id());
+    metadata.set_md5_checksum(entry.file_md5());
+    metadata.set_conflicted(false);
+    metadata.set_to_be_fetched(true);
+
+    base::FilePath path = TitleToPath(entry.title());
+    fileapi::FileSystemURL url(CreateSyncableFileSystemURL(
+        origin, kServiceName, path));
+    metadata_store_->UpdateEntry(url, metadata,
+                                 base::Bind(&EmptyStatusCallback));
   }
 
   GURL next_feed_url;
@@ -1946,11 +1949,11 @@ void DriveFileSyncService::MaybeStartFetchChanges() {
 
   // If we have pending_batch_sync_origins, try starting the batch sync.
   if (!pending_batch_sync_origins_.empty()) {
-    if (GetCurrentState() == REMOTE_SERVICE_OK || may_have_unfetched_changes_) {
-      task_manager_->ScheduleTaskIfIdle(
-          base::Bind(&DriveFileSyncService::StartBatchSync, AsWeakPtr()));
-    }
-    return;
+    if (GetCurrentState() != REMOTE_SERVICE_OK && !may_have_unfetched_changes_)
+      return;
+
+    task_manager_->ScheduleTaskIfIdle(
+        base::Bind(&DriveFileSyncService::StartBatchSync, AsWeakPtr()));
   }
 
   if (may_have_unfetched_changes_ &&