Clear syncing flag after a remote or local sync

chrome/browser/sync_file_system/sync_file_system_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/sync_file_system_service.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/stl_util.h"
@@ skipping 364 matching lines @@
 void SyncFileSystemService::DidProcessRemoteChange(
     fileapi::SyncStatusCode status,
     const FileSystemURL& url,
     fileapi::SyncOperationType type) {
   DVLOG(1) << "DidProcessRemoteChange: "
            << " status=" << status
            << " url=" << url.DebugString()
            << " operation_type=" << type;
   DCHECK(remote_sync_running_);
   remote_sync_running_ = false;
+
+  if (status != fileapi::SYNC_STATUS_NO_CHANGE_TO_SYNC &&
+      remote_file_service_->GetCurrentState() != REMOTE_SERVICE_DISABLED) {
+    DCHECK(url.is_valid());
+    local_file_service_->ClearSyncFlagForURL(url);
+  }
+
   if (status == fileapi::SYNC_STATUS_OK &&
       type != fileapi::SYNC_OPERATION_NONE) {
     // Notify observers of the changes made for a remote sync.
     FOR_EACH_OBSERVER(SyncEventObserver, observers_, OnFileSynced(url, type));
   } else if (status == fileapi::SYNC_STATUS_NO_CHANGE_TO_SYNC) {
     // We seem to have no changes to work on for now.
     // TODO(kinuko): Might be better setting a timer to call MaybeStartSync.
     return;
   } else if (status == fileapi::SYNC_STATUS_FILE_BUSY) {
     is_waiting_remote_sync_enabled_ = true;
     local_file_service_->RegisterURLForWaitingSync(
         url, base::Bind(&SyncFileSystemService::OnSyncEnabledForRemoteSync,
                         AsWeakPtr()));
     return;
   } else if (status == fileapi::SYNC_STATUS_HAS_CONFLICT) {
     // TODO(kinuko,tzik): Handle conflict!
   }
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE, base::Bind(&SyncFileSystemService::MaybeStartSync,
                             AsWeakPtr()));
 }
 
 void SyncFileSystemService::DidProcessLocalChange(
     fileapi::SyncStatusCode status, const FileSystemURL& url) {
   DVLOG(1) << "DidProcessLocalChange: "
            << " status=" << status
            << " url=" << url.DebugString();
   DCHECK(local_sync_running_);
   local_sync_running_ = false;
+
+  if (status != fileapi::SYNC_STATUS_NO_CHANGE_TO_SYNC) {
+    DCHECK(url.is_valid());
+    local_file_service_->ClearSyncFlagForURL(url);
+  }
+
   if (status == fileapi::SYNC_STATUS_NO_CHANGE_TO_SYNC) {
     // We seem to have no changes to work on for now.
     // TODO(kinuko): Might be better setting a timer to call MaybeStartSync.
     return;
   } else if (status == fileapi::SYNC_STATUS_HAS_CONFLICT) {
     // TODO(kinuko,tzik): Handle conflict!
   }
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE, base::Bind(&SyncFileSystemService::MaybeStartSync,
                             AsWeakPtr()));
@@ skipping 95 matching lines @@
     remote_file_service = mock_remote_file_service_.Pass();
   else
     remote_file_service.reset(new DriveFileSyncService(profile));
 
   service->Initialize(local_file_service.Pass(),
                       remote_file_service.Pass());
   return service;
 }
 
 }  // namespace sync_file_system