Add to be fetched files instead of DriveMetadataStore.batch_sync_origins_

chrome/browser/sync_file_system/drive_metadata_store.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync_file_system/drive_metadata_store.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 518 matching lines @@
 }
 
 bool DriveMetadataStore::IsOriginDisabled(const GURL& origin) const {
   DCHECK(CalledOnValidThread());
   return ContainsKey(disabled_origins_, origin);
 }
 
 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))
+    return;
+
   batch_sync_origins_.insert(std::make_pair(origin, resource_id));
   origin_by_resource_id_.insert(std::make_pair(resource_id, origin));
 
   // Store a pair of |origin| and |resource_id| in the DB.
   base::PostTaskAndReplyWithResult(
       file_task_runner_, FROM_HERE,
       base::Bind(&DriveMetadataDB::UpdateOriginAsBatchSync,
                  base::Unretained(db_.get()), origin, resource_id),
       base::Bind(&DriveMetadataStore::UpdateDBStatus, AsWeakPtr()));
 }
@@ skipping 25 matching lines @@
   DCHECK(CalledOnValidThread());
 
   std::map<GURL, std::string>::iterator found = disabled_origins_.find(origin);
   if (found == disabled_origins_.end()) {
     // |origin| has not been registered yet.
     return;
   }
   std::string resource_id = found->second;
   disabled_origins_.erase(found);
 
-  // Ensure |origin| is marked as a batch sync origin.
-  batch_sync_origins_.insert(std::make_pair(origin, resource_id));
+  // |Origin| goes back to DriveFileSyncService.pending_batch_sync_origins_
+  // only and is not stored in drive_metadata_store.
   found = incremental_sync_origins_.find(origin);
   if (found != incremental_sync_origins_.end())
     incremental_sync_origins_.erase(found);
 
   // Store a pair of |origin| and |resource_id| in the DB.
   base::PostTaskAndReplyWithResult(
       file_task_runner_, FROM_HERE,
       base::Bind(&DriveMetadataDB::EnableOrigin,
                  base::Unretained(db_.get()), origin, resource_id),
       base::Bind(&DriveMetadataStore::DidUpdateOrigin, AsWeakPtr(), callback));
@@ skipping 578 matching lines @@
     DCHECK(origin.is_valid());
     bool result = disabled_origins->insert(
         std::make_pair(origin, itr->value().ToString())).second;
     DCHECK(result);
   }
 
   return SYNC_STATUS_OK;
 }
 
 }  // namespace sync_file_system