Remote changes should be appended even if we already have changes

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 1344 matching lines @@
     else
       file_type = fileapi::SYNC_FILE_TYPE_FILE;
   }
 
   fileapi::FileChange file_change(change_type, file_type);
 
   std::pair<PendingChangeQueue::iterator, bool> inserted_to_queue =
       pending_changes_.insert(ChangeQueueItem(changestamp, sync_type, url));
   DCHECK(inserted_to_queue.second);
 
+  DVLOG(3) << "Append remote change: " << path.value()
+           << "@" << changestamp << " "
+           << file_change.DebugString();
+
   (*path_to_change)[path] = RemoteChange(
       changestamp, entry.resource_id(), url, file_change,
       inserted_to_queue.first);
   return true;
 }
 
 void DriveFileSyncService::RemoveRemoteChange(
     const fileapi::FileSystemURL& url) {
   URLToChange::iterator found_origin = url_to_change_.find(url.origin());
   if (found_origin == url_to_change_.end())
@@ skipping 63 matching lines @@
     scoped_ptr<google_apis::DocumentFeed> changes) {
   if (error != google_apis::HTTP_SUCCESS) {
     NotifyTaskDone(GDataErrorCodeToSyncStatusCodeWrapper(error), token.Pass());
     return;
   }
 
   typedef ScopedVector<google_apis::DocumentEntry>::const_iterator iterator;
   for (iterator itr = changes->entries().begin();
        itr != changes->entries().end(); ++itr) {
     const google_apis::DocumentEntry& entry = **itr;
-    DVLOG(3) << " change:" << entry.title();
     GURL origin;
     if (!GetOriginForEntry(entry, &origin))
       continue;
 
-    has_new_changes = has_new_changes ||
+    DVLOG(3) << " * change:" << entry.title()
+             << (entry.deleted() ? " (deleted)" : " ")
+             << "[" << origin.spec() << "]";
+    has_new_changes =
         AppendNewRemoteChange(origin, entry, entry.changestamp(),
-                              REMOTE_SYNC_TYPE_INCREMENTAL);
+                              REMOTE_SYNC_TYPE_INCREMENTAL) || has_new_changes;
   }
 
   GURL next_feed;
   if (changes->GetNextFeedURL(&next_feed)) {
     sync_client_->ContinueListing(
         next_feed,
         base::Bind(&DriveFileSyncService::DidFetchChangesForIncrementalSync,
                    AsWeakPtr(), base::Passed(&token), has_new_changes));
     return;
   }
@@ skipping 67 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