Clear syncing flag after a remote or local sync

chrome/browser/sync_file_system/local_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/local_file_sync_service.h"
 
 #include "base/stl_util.h"
 #include "chrome/browser/sync_file_system/local_change_processor.h"
 #include "content/public/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
@@ skipping 130 matching lines @@
 }
 
 void LocalFileSyncService::HasPendingLocalChanges(
     const fileapi::FileSystemURL& url,
     const HasPendingLocalChangeCallback& callback) {
   DCHECK(ContainsKey(origin_to_contexts_, url.origin()));
   sync_context_->HasPendingLocalChanges(
       origin_to_contexts_[url.origin()], url, callback);
 }
 
+void LocalFileSyncService::ClearSyncFlagForURL(
+    const fileapi::FileSystemURL& url) {
+  DCHECK(ContainsKey(origin_to_contexts_, url.origin()));
+  sync_context_->ClearSyncFlagForURL(url);
+}
+
 void LocalFileSyncService::GetLocalFileMetadata(
     const fileapi::FileSystemURL& url,
     const SyncFileMetadataCallback& callback) {
   DCHECK(ContainsKey(origin_to_contexts_, url.origin()));
   sync_context_->GetFileMetadata(origin_to_contexts_[url.origin()],
                                  url, callback);
 }
 
 void LocalFileSyncService::PrepareForProcessRemoteChange(
     const FileSystemURL& url,
@@ skipping 49 matching lines @@
   local_sync_callback_.Reset();
   callback.Run(status, url);
 }
 
 void LocalFileSyncService::DidGetFileForLocalSync(
     LocalChangeProcessor* processor,
     SyncStatusCode status,
     const LocalFileSyncInfo& sync_file_info) {
   DCHECK(!local_sync_callback_.is_null());
   if (status != fileapi::SYNC_STATUS_OK) {
-    RunLocalSyncCallback(status, FileSystemURL());
+    RunLocalSyncCallback(status, sync_file_info.url);
     return;
   }
   if (sync_file_info.changes.empty()) {
     // There's a slight chance this could happen.
     fileapi::SyncFileCallback callback = local_sync_callback_;
     local_sync_callback_.Reset();
     ProcessLocalChange(processor, callback);
     return;
   }
 
@@ skipping 34 matching lines @@
   // a sync error.
 
   const FileSystemURL& url = sync_file_info.url;
   if (status != fileapi::SYNC_STATUS_OK || changes.empty()) {
     if (status == fileapi::SYNC_STATUS_OK ||
         status == fileapi::SYNC_STATUS_HAS_CONFLICT) {
       // Clear the recorded changes for the URL if the sync was successfull
       // OR has failed due to conflict (so that we won't stick to the same
       // conflicting file again and again).
       DCHECK(ContainsKey(origin_to_contexts_, url.origin()));
-      sync_context_->FinalizeSyncForURL(origin_to_contexts_[url.origin()], url);
+      sync_context_->ClearChangesForURL(
+          origin_to_contexts_[url.origin()], url,
+          base::Bind(&LocalFileSyncService::RunLocalSyncCallback,
+                     AsWeakPtr(), status, url));
+      return;
     }
     RunLocalSyncCallback(status, url);
     return;
   }
 
   DCHECK(processor);
   processor->ApplyLocalChange(
       changes.front(),
       sync_file_info.local_file_path,
       sync_file_info.metadata,
       url,
       base::Bind(&LocalFileSyncService::ProcessNextChangeForURL,
                  AsWeakPtr(), processor, sync_file_info,
                  changes.front(), changes.PopAndGetNewList()));
 }
 
 }  // namespace sync_file_system