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 2958e356e9ab251fb91512978f3e0ce514cf8c31..83f88b858bde3d645f7f3e9e5362abb28c16b986 100644
--- a/chrome/browser/sync_file_system/drive_file_sync_service.cc
+++ b/chrome/browser/sync_file_system/drive_file_sync_service.cc
@@ -435,15 +435,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);
@@ -559,7 +550,8 @@ void DriveFileSyncService::DoEnableOriginForTrackingChanges(
   }
 
   metadata_store_->EnableOrigin(origin, callback);
-  pending_batch_sync_origins_.insert(origin);
+  pending_batch_sync_origins_.insert(std::make_pair(
+      origin, metadata_store_->disabled_origins().find(origin)->second));
 }
 
 void DriveFileSyncService::DoDisableOriginForTrackingChanges(
@@ -703,7 +695,8 @@ void DriveFileSyncService::UpdateRegisteredOrigins() {
                extension_service->IsExtensionEnabled(extension_id)) {
       // Extension has been re-enabled.
       metadata_store_->EnableOrigin(origin, base::Bind(&EmptyStatusCallback));
-      pending_batch_sync_origins_.insert(origin);
+      pending_batch_sync_origins_.insert(std::make_pair(
+          origin, metadata_store_->disabled_origins().find(origin)->second));
     }
   }
 }
@@ -711,16 +704,12 @@ void DriveFileSyncService::UpdateRegisteredOrigins() {
 void DriveFileSyncService::StartBatchSync(
     const SyncStatusCallback& callback) {
   DCHECK(GetCurrentState() == REMOTE_SERVICE_OK || may_have_unfetched_changes_);
+  DCHECK(!pending_batch_sync_origins_.empty());
 
-  if (pending_batch_sync_origins_.empty()) {
-    callback.Run(SYNC_STATUS_OK);
-    return;
-  }
-
-  GURL origin = *pending_batch_sync_origins_.begin();
-  pending_batch_sync_origins_.erase(pending_batch_sync_origins_.begin());
-  std::string resource_id = metadata_store_->GetResourceIdForOrigin(origin);
+  GURL origin = pending_batch_sync_origins_.begin()->first;
+  std::string resource_id = pending_batch_sync_origins_.find(origin)->second;
   DCHECK(!resource_id.empty());
+  pending_batch_sync_origins_.erase(pending_batch_sync_origins_.begin());
 
   DCHECK(!metadata_store_->IsOriginDisabled(origin));
 
@@ -758,9 +747,10 @@ 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);
-    pending_batch_sync_origins_.insert(origin);
+    pending_batch_sync_origins_.insert(std::make_pair(origin, resource_id));
   }
 
   callback.Run(SYNC_STATUS_OK);
@@ -788,7 +778,7 @@ void DriveFileSyncService::DidGetLargestChangeStampForBatchSync(
     google_apis::GDataErrorCode error,
     int64 largest_changestamp) {
   if (error != google_apis::HTTP_SUCCESS) {
-    pending_batch_sync_origins_.insert(origin);
+    pending_batch_sync_origins_.insert(std::make_pair(origin, resource_id));
     callback.Run(GDataErrorCodeToSyncStatusCodeWrapper(error));
     return;
   }
@@ -806,17 +796,19 @@ void DriveFileSyncService::DidGetLargestChangeStampForBatchSync(
                  AsWeakPtr(),
                  callback,
                  origin,
+                 resource_id,
                  largest_changestamp));
 }
 
 void DriveFileSyncService::DidGetDirectoryContentForBatchSync(
     const SyncStatusCallback& callback,
     const GURL& origin,
+    const std::string& resource_id,
     int64 largest_changestamp,
     google_apis::GDataErrorCode error,
     scoped_ptr<google_apis::ResourceList> feed) {
   if (error != google_apis::HTTP_SUCCESS) {
-    pending_batch_sync_origins_.insert(origin);
+    pending_batch_sync_origins_.insert(std::make_pair(origin, resource_id));
     callback.Run(GDataErrorCodeToSyncStatusCodeWrapper(error));
     return;
   }
@@ -824,8 +816,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;
@@ -836,16 +842,15 @@ void DriveFileSyncService::DidGetDirectoryContentForBatchSync(
                    AsWeakPtr(),
                    callback,
                    origin,
+                   resource_id,
                    largest_changestamp));
     return;
   }
 
-  // Move |origin| to the incremental sync origin set if the origin has no file.
-  if (metadata_store_->IsBatchSyncOrigin(origin) &&
-      !remote_change_handler_.HasChangesForOrigin(origin)) {
-    metadata_store_->MoveBatchSyncOriginToIncremental(origin);
-  }
-
+  // TODO(calvinlo): Eliminate batch_sync_origins so
+  // MoveBatchSyncOriginToIncremental() happens directly.
+  metadata_store_->AddBatchSyncOrigin(origin, resource_id);
+  metadata_store_->MoveBatchSyncOriginToIncremental(origin);
   may_have_unfetched_changes_ = true;
   callback.Run(SYNC_STATUS_OK);
 }
@@ -1947,11 +1952,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;

[tzik, 2013/05/17 05:29:36]

This part changes the behavior: new code doesn't return if
|pending_batch_sync_origins| is non-empty. Is it intentional?

[calvinlo, 2013/05/17 08:02:20]

Thanks for catching this. Sorry, I didn't notice that. I'll revert this back to
the way it was before.

+
+    task_manager_->ScheduleTaskIfIdle(
+        base::Bind(&DriveFileSyncService::StartBatchSync, AsWeakPtr()));
   }
 
   if (may_have_unfetched_changes_ &&
@@ -2186,7 +2191,7 @@ void DriveFileSyncService::DidEnsureOriginRoot(
       metadata_store_->IsKnownOrigin(origin)) {
     metadata_store_->SetOriginRootDirectory(origin, resource_id);
     if (metadata_store_->IsBatchSyncOrigin(origin))
-      pending_batch_sync_origins_.insert(origin);
+      pending_batch_sync_origins_.insert(std::make_pair(origin, resource_id));
   }
   callback.Run(status, resource_id);
 }