[SyncFS] Promote demoted changes in default remote side backend

chrome/browser/sync_file_system/sync_file_system_service_unittest.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 <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 101 matching lines @@
 ACTION_P(MockStatusCallback, status) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(arg4, status));
 }
 
 ACTION_P2(MockSyncFileCallback, status, url) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(arg0, status, url));
 }
 
+ACTION(InvokeCompletionClosure) {
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
+      FROM_HERE, base::Bind(arg0));
+}
+
 class SyncFileSystemServiceTest : public testing::Test {
  protected:
   SyncFileSystemServiceTest()
       : thread_bundle_(content::TestBrowserThreadBundle::REAL_FILE_THREAD |
                        content::TestBrowserThreadBundle::REAL_IO_THREAD) {}
 
   virtual void SetUp() OVERRIDE {
     in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
     file_system_.reset(new CannedSyncableFileSystem(
         GURL(kOrigin),
@@ skipping 210 matching lines @@
   }
 
   // The local_change_processor's ApplyLocalChange should be called once
   // with ADD_OR_UPDATE change for TYPE_FILE.
   const FileChange change(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
                           SYNC_FILE_TYPE_FILE);
   EXPECT_CALL(*mock_local_change_processor(),
               ApplyLocalChange(change, _, _, kFile, _))
       .WillOnce(MockStatusCallback(SYNC_STATUS_OK));
 
+  EXPECT_CALL(*mock_remote_service(), PromoteDemotedChanges(_))
+      .WillRepeatedly(InvokeCompletionClosure());
+
   EXPECT_EQ(base::File::FILE_OK, file_system_->CreateFile(kFile));
 
   run_loop.Run();
 
   file_system_->RemoveSyncStatusObserver(&status_observer);
 }
 
 TEST_F(SyncFileSystemServiceTest, SimpleRemoteSyncFlow) {
   InitializeApp();
 
@@ skipping 29 matching lines @@
     EXPECT_CALL(*mock_remote_service(), ProcessRemoteChange(_))
         .WillOnce(MockSyncFileCallback(SYNC_STATUS_FILE_BUSY,
                                        kFile));
 
     // ProcessRemoteChange should be called again when the becomes
     // not busy.
     EXPECT_CALL(*mock_remote_service(), ProcessRemoteChange(_))
         .WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
   }
 
+  EXPECT_CALL(*mock_remote_service(), PromoteDemotedChanges(_))
+      .WillRepeatedly(InvokeCompletionClosure());
+
   // We might also see an activity for local sync as we're going to make
   // a local write operation on kFile.
   EXPECT_CALL(*mock_local_change_processor(),
               ApplyLocalChange(_, _, _, kFile, _))
       .Times(AnyNumber());
 
   // This should trigger a remote sync.
   mock_remote_service()->NotifyRemoteChangeQueueUpdated(1);
 
   // Start a local operation on the same file (to make it BUSY).
@@ skipping 55 matching lines @@
         base::Bind(&AssignValueAndQuit<SyncFileStatus>,
                    &run_loop, &status, &sync_file_status));
     run_loop.Run();
 
     EXPECT_EQ(SYNC_STATUS_OK, status);
     EXPECT_EQ(SYNC_FILE_STATUS_HAS_PENDING_CHANGES, sync_file_status);
   }
 }
 
 }  // namespace sync_file_system