[SyncFS] Promote demoted changes in default remote side backend

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 <string>
 
 #include "base/bind.h"
 #include "base/format_macros.h"
@@ skipping 350 matching lines @@
        iter != remote_sync_runners_.end(); ++iter)
     remote_changes += (*iter)->pending_changes();
   if (remote_changes == 0)
     local_service_->PromoteDemotedChanges(NoopClosure());
 
   int64 local_changes = 0;
   for (ScopedVector<SyncProcessRunner>::iterator iter =
            local_sync_runners_.begin();
        iter != local_sync_runners_.end(); ++iter)
     local_changes += (*iter)->pending_changes();
-  if (local_changes == 0 && v2_remote_service_)
-    v2_remote_service_->PromoteDemotedChanges(NoopClosure());
+  if (local_changes == 0) {
+    remote_service_->PromoteDemotedChanges(NoopClosure());
+    if (v2_remote_service_)
+      v2_remote_service_->PromoteDemotedChanges(NoopClosure());
+  }
 }
 
 SyncServiceState SyncFileSystemService::GetSyncServiceState() {
   // For now we always query the state from the main RemoteFileSyncService.
   return RemoteStateToSyncServiceState(remote_service_->GetCurrentState());
 }
 
 SyncFileSystemService* SyncFileSystemService::GetSyncService() {
   return this;
 }
@@ skipping 376 matching lines @@
     v2_remote_service_->AddServiceObserver(v2_remote_syncer.get());
     v2_remote_service_->AddFileStatusObserver(this);
     v2_remote_service_->SetRemoteChangeProcessor(local_service_.get());
     v2_remote_service_->SetSyncEnabled(sync_enabled_);
     remote_sync_runners_.push_back(v2_remote_syncer.release());
   }
   return v2_remote_service_.get();
 }
 
 }  // namespace sync_file_system