Add to be fetched files instead of DriveMetadataStore.batch_sync_origins_

chrome/browser/sync_file_system/drive_metadata_store.cc

Index: chrome/browser/sync_file_system/drive_metadata_store.cc
diff --git a/chrome/browser/sync_file_system/drive_metadata_store.cc b/chrome/browser/sync_file_system/drive_metadata_store.cc
index b85e5b5a94c08bdf3564ca05b1ab8a4ae4b0188a..905543aa9f4a8594e3448c5cad8621d77c148a76 100644
--- a/chrome/browser/sync_file_system/drive_metadata_store.cc
+++ b/chrome/browser/sync_file_system/drive_metadata_store.cc
@@ -536,11 +536,13 @@ bool DriveMetadataStore::IsOriginDisabled(const GURL& origin) const {
 void DriveMetadataStore::AddBatchSyncOrigin(const GURL& origin,
                                             const std::string& resource_id) {
   DCHECK(CalledOnValidThread());
-  DCHECK(!IsBatchSyncOrigin(origin));
   DCHECK(!IsIncrementalSyncOrigin(origin));
   DCHECK(!IsOriginDisabled(origin));
   DCHECK_EQ(SYNC_STATUS_OK, db_status_);
 
+  if (IsBatchSyncOrigin(origin))

[tzik, 2013/05/17 09:36:56]

can this case happen?

[calvinlo, 2013/05/17 10:02:36]

Yes, in some of the tests a batch sync origin is added. The message loop then
runs and the new code adds the origin to batch again before moving it to
incremental. This happens because of the line you asked me to move in the first
review  .

https://codereview.chromium.org/15023022/diff/15001/chrome/browser/sync_file_...
Line 762.
This used to be protected with a condition if
(!metadata_store_->IsKnownOrigin(origin)). Either I can add that condition to
line drive_file_sync_service 852, or I can do the check here. 

I'm not sure it actually matters though as I'm going to kill off the batch sync
next anyway.

+    return;
+
   batch_sync_origins_.insert(std::make_pair(origin, resource_id));
   origin_by_resource_id_.insert(std::make_pair(resource_id, origin));