Fix incremental sync behavior of DriveFileSyncService.

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 1065 matching lines @@
   if (param->drive_metadata.conflicted()) {
     if (missing_local_file) {
       if (param->remote_change.change.IsAddOrUpdate()) {
         NOTIMPLEMENTED() << "ResolveToRemote()";
         AbortRemoteSync(param.Pass(), fileapi::SYNC_STATUS_FAILED);
         return;
       }
 
       DCHECK(param->remote_change.change.IsDelete());
       param->operation_type = fileapi::SYNC_OPERATION_NONE;
-      DeleteMetadataForRemoteSync(param.Pass());
+      if (missing_db_entry)
+        CompleteRemoteSync(param.Pass(), fileapi::SYNC_STATUS_OK);

[kinuko, 2012/12/04 08:55:42]

Could this happen? (We're in metadata.conflicted() block)

[tzik, 2012/12/04 09:14:29]

Done. It can't be reached.

+      else
+        DeleteMetadataForRemoteSync(param.Pass());
       return;
     }
 
     DCHECK(!missing_local_file);
     if (param->remote_change.change.IsAddOrUpdate()) {
       param->operation_type = fileapi::SYNC_OPERATION_NONE;
       param->drive_metadata.set_conflicted(true);
 
       metadata_store_->UpdateEntry(
           url, drive_metadata,
@@ skipping 38 matching lines @@
     DCHECK(local_changes.list().back().IsDelete());
     param->operation_type = fileapi::SYNC_OPERATION_ADD;
     DownloadForRemoteSync(param.Pass());
     return;
   }
 
   DCHECK(param->remote_change.change.IsDelete());
   if (local_changes.empty()) {
     if (missing_local_file) {
       param->operation_type = fileapi::SYNC_OPERATION_NONE;
-      DeleteMetadataForRemoteSync(param.Pass());
+      if (missing_db_entry)
+        CompleteRemoteSync(param.Pass(), fileapi::SYNC_STATUS_OK);
+      else
+        DeleteMetadataForRemoteSync(param.Pass());
       return;
     }
     DCHECK(!missing_local_file);
     param->operation_type = fileapi::SYNC_OPERATION_DELETE;
 
     const fileapi::FileChange& file_change = param->remote_change.change;
     param->processor->ApplyRemoteChange(
         file_change, FilePath(), url,
         base::Bind(&DriveFileSyncService::DidApplyRemoteChange, AsWeakPtr(),
                    base::Passed(&param)));
     return;
   }
 
   DCHECK(!local_changes.empty());
   if (local_changes.list().back().IsAddOrUpdate()) {
     param->operation_type = fileapi::SYNC_OPERATION_NONE;
     CompleteRemoteSync(param.Pass(), fileapi::SYNC_STATUS_OK);
     return;
   }
 
   DCHECK(local_changes.list().back().IsDelete());
   param->operation_type = fileapi::SYNC_OPERATION_NONE;
-  DeleteMetadataForRemoteSync(param.Pass());
+  if (missing_db_entry)
+    CompleteRemoteSync(param.Pass(), fileapi::SYNC_STATUS_OK);
+  else
+    DeleteMetadataForRemoteSync(param.Pass());
 }
 
 void DriveFileSyncService::DownloadForRemoteSync(
     scoped_ptr<ProcessRemoteChangeParam> param) {
   // TODO(tzik): Use ShareableFileReference here after we get thread-safe
   // version of it. crbug.com/162598
   FilePath* temporary_file_path = &param->temporary_file_path;
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::FILE, FROM_HERE,
       base::Bind(&CreateTemporaryFile,
@@ skipping 217 matching lines @@
 
   polling_enabled_ = false;
   token->set_completion_callback(base::Bind(&EnablePolling, &polling_enabled_));
 
   if (metadata_store_->incremental_sync_origins().empty()) {
     NotifyTaskDone(fileapi::SYNC_STATUS_OK, token.Pass());
     return;
   }
 
   sync_client_->ListChanges(
-      largest_fetched_changestamp_,
+      largest_fetched_changestamp_ + 1,
       base::Bind(&DriveFileSyncService::DidFetchChangesForIncrementalSync,
                  AsWeakPtr(), base::Passed(&token)));
 }
 
 void DriveFileSyncService::DidFetchChangesForIncrementalSync(
     scoped_ptr<TaskToken> token,
     google_apis::GDataErrorCode error,
     scoped_ptr<google_apis::DocumentFeed> changes) {
   if (error != google_apis::HTTP_SUCCESS) {
     NotifyTaskDone(GDataErrorCodeToSyncStatusCodeWrapper(error), token.Pass());
@@ skipping 90 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