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))

[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));
 
   // 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 625 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