Sync FileSystem: Mark empty batch sync origin as incremental sync origin.

chrome/browser/sync_file_system/drive_file_sync_service.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_file_sync_service.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 869 matching lines @@
   GURL next_feed_url;
   if (feed->GetNextFeedURL(&next_feed_url)) {
     sync_client_->ContinueListing(
         next_feed_url,
         base::Bind(
             &DriveFileSyncService::DidGetDirectoryContentForBatchSync,
             AsWeakPtr(), base::Passed(&token), origin, largest_changestamp));
     return;
   }
 
+  if (metadata_store_->IsBatchSyncOrigin(origin) &&
+      !ContainsKey(url_to_change_, origin)) {

[kinuko, 2013/01/04 10:38:54]

This is not directly related to this change, but can we rename 'url_to_change_'
(and its type name) to 'origin_to_change_map_' or 'origin_to_changes_'?

[tzik, 2013/01/07 08:37:55]

Let me rename to 'origin_to_changes_map_'.
Its type is Origin -> Path -> Change or (Origin, Path) -> Change.

+    metadata_store_->MoveBatchSyncOriginToIncremental(origin);
+  }
+
   NotifyTaskDone(fileapi::SYNC_STATUS_OK, token.Pass());
 }
 
 void DriveFileSyncService::DidRemoveOriginOnMetadataStore(
     scoped_ptr<TaskToken> token,
     const fileapi::SyncStatusCallback& callback,
     fileapi::SyncStatusCode status) {
   NotifyTaskDone(status, token.Pass());
   callback.Run(status);
 }
@@ skipping 792 matching lines @@
 fileapi::SyncStatusCode
 DriveFileSyncService::GDataErrorCodeToSyncStatusCodeWrapper(
     google_apis::GDataErrorCode error) const {
   fileapi::SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error);
   if (status != fileapi::SYNC_STATUS_OK && !sync_client_->IsAuthenticated())
     return fileapi::SYNC_STATUS_AUTHENTICATION_FAILED;
   return status;
 }
 
 }  // namespace sync_file_system