[SyncFS] Demote local file changes before local-to-remote sync (3/3)

chrome/browser/sync_file_system/local/local_file_sync_context.cc

 // Copyright 2013 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/local/local_file_sync_context.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 155 matching lines @@
   DCHECK(backend);
   DCHECK(backend->change_tracker());
 
   if (sync_finish_status == SYNC_STATUS_OK ||
       sync_finish_status == SYNC_STATUS_HAS_CONFLICT) {
     // Commit the in-memory mirror change.
     backend->change_tracker()->ResetToMirrorAndCommitChangesForURL(url);
   } else {
     // Abort in-memory mirror change.
     backend->change_tracker()->RemoveMirrorAndCommitChangesForURL(url);
-    if (sync_finish_status == SYNC_STATUS_FILE_BUSY)
-      backend->change_tracker()->DemoteChangesForURL(url);
   }
 
   // We've been keeping it in writing mode, so clear the writing counter
   // to unblock sync activities.
   io_task_runner_->PostTask(
       FROM_HERE, base::Bind(
           &LocalFileSyncContext::FinalizeSnapshotSyncOnIOThread, this, url));
 
   // Call the completion callback on UI thread.
   ui_task_runner_->PostTask(FROM_HERE, done_callback);
@@ skipping 502 matching lines @@
   DCHECK(origins_with_changes);
   tracker_ptr->reset(new LocalFileChangeTracker(
           file_system_context->partition_path(),
           env_override_,
           file_system_context->default_file_task_runner()));
   const SyncStatusCode status = (*tracker_ptr)->Initialize(file_system_context);
   if (status != SYNC_STATUS_OK)
     return status;
 
   // Get all origins that have pending changes.
-  std::deque<FileSystemURL> urls;
+  FileSystemURLQueue urls;
   (*tracker_ptr)->GetNextChangedURLs(&urls, 0);
-  for (std::deque<FileSystemURL>::iterator iter = urls.begin();
+  for (FileSystemURLQueue::iterator iter = urls.begin();
        iter != urls.end(); ++iter) {
     origins_with_changes->insert(iter->origin());
   }
 
   // Creates snapshot directory.
   base::CreateDirectory(local_base_path_.Append(kSnapshotDir));
 
   return status;
 }
 
@@ skipping 65 matching lines @@
   DCHECK(file_system_context);
   DCHECK(file_system_context->default_file_task_runner()->
              RunsTasksOnCurrentThread());
   SyncFileSystemBackend* backend =
       SyncFileSystemBackend::GetBackend(file_system_context);
   DCHECK(backend);
   DCHECK(backend->change_tracker());
   scoped_ptr<FileSystemURLQueue> urls(new FileSystemURLQueue);
   backend->change_tracker()->GetNextChangedURLs(
       urls.get(), kMaxURLsToFetchForLocalSync);
+  for (FileSystemURLQueue::iterator iter = urls->begin();
+       iter != urls->end(); ++iter)
+    backend->change_tracker()->DemoteChangesForURL(*iter);
+
   return urls.Pass();
 }
 
 void LocalFileSyncContext::TryPrepareForLocalSync(
     FileSystemContext* file_system_context,
     const LocalFileSyncInfoCallback& callback,
     scoped_ptr<FileSystemURLQueue> urls) {
   DCHECK(ui_task_runner_->RunsTasksOnCurrentThread());
   DCHECK(urls);
 
@@ skipping 21 matching lines @@
 
 void LocalFileSyncContext::DidTryPrepareForLocalSync(
     FileSystemContext* file_system_context,
     scoped_ptr<FileSystemURLQueue> remaining_urls,
     const LocalFileSyncInfoCallback& callback,
     SyncStatusCode status,
     const LocalFileSyncInfo& sync_file_info,
     webkit_blob::ScopedFile snapshot) {
   DCHECK(ui_task_runner_->RunsTasksOnCurrentThread());
   if (status != SYNC_STATUS_FILE_BUSY) {
+    PromoteDemotedChangesForURLs(file_system_context,
+                                 remaining_urls.Pass());
     callback.Run(status, sync_file_info, snapshot.Pass());
     return;
   }
+
+  PromoteDemotedChangesForURL(file_system_context, sync_file_info.url);
+
   // Recursively call TryPrepareForLocalSync with remaining_urls.
   TryPrepareForLocalSync(file_system_context, callback, remaining_urls.Pass());
 }
 
+void LocalFileSyncContext::PromoteDemotedChangesForURL(
+    FileSystemContext* file_system_context,
+    const FileSystemURL& url) {
+  DCHECK(file_system_context);
+  if (!file_system_context->default_file_task_runner()->
+          RunsTasksOnCurrentThread()) {
+    DCHECK(ui_task_runner_->RunsTasksOnCurrentThread());
+    if (shutdown_on_ui_)
+      return;
+    file_system_context->default_file_task_runner()->PostTask(
+        FROM_HERE,
+        base::Bind(&LocalFileSyncContext::PromoteDemotedChangesForURL,
+                   this, make_scoped_refptr(file_system_context), url));
+    return;
+  }
+
+  SyncFileSystemBackend* backend =
+      SyncFileSystemBackend::GetBackend(file_system_context);
+  DCHECK(backend);
+  DCHECK(backend->change_tracker());
+  backend->change_tracker()->PromoteDemotedChangesForURL(url);
+}
+
+void LocalFileSyncContext::PromoteDemotedChangesForURLs(
+    FileSystemContext* file_system_context,
+    scoped_ptr<FileSystemURLQueue> urls) {
+  DCHECK(file_system_context);
+  if (!file_system_context->default_file_task_runner()->
+          RunsTasksOnCurrentThread()) {
+    DCHECK(ui_task_runner_->RunsTasksOnCurrentThread());
+    if (shutdown_on_ui_)
+      return;
+    file_system_context->default_file_task_runner()->PostTask(
+        FROM_HERE,
+        base::Bind(&LocalFileSyncContext::PromoteDemotedChangesForURLs,
+                   this, make_scoped_refptr(file_system_context),
+                   base::Passed(&urls)));
+    return;
+  }
+
+  for (FileSystemURLQueue::iterator iter = urls->begin();
+       iter != urls->end(); ++iter)
+    PromoteDemotedChangesForURL(file_system_context, *iter);
+}
+
 void LocalFileSyncContext::DidGetWritingStatusForSync(
     FileSystemContext* file_system_context,
     SyncStatusCode status,
     const FileSystemURL& url,
     SyncMode sync_mode,
     const LocalFileSyncInfoCallback& callback) {
   // This gets called on UI thread and relays the task on FILE thread.
   DCHECK(file_system_context);
   if (!file_system_context->default_file_task_runner()->
           RunsTasksOnCurrentThread()) {
@@ skipping 163 matching lines @@
     return;
   }
 
   FileSystemURL url_for_sync = CreateSyncableFileSystemURLForSync(
       file_system_context, dest_url);
   file_system_context->operation_runner()->CopyInForeignFile(
       local_path, url_for_sync, callback);
 }
 
 }  // namespace sync_file_system