Clear syncing flag after a remote or local sync

chrome/browser/sync_file_system/local_file_sync_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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/location.h"
 #include "base/message_loop_proxy.h"
 #include "base/run_loop.h"
@@ skipping 296 matching lines @@
   file_system2.TearDown();
 }
 
 TEST_F(LocalFileSyncServiceTest, ProcessLocalChange_CreateFile) {
   const FileSystemURL kFile(file_system_->URL("foo"));
   const char kTestFileData[] = "0123456789";
   const int kTestFileDataSize = static_cast<int>(arraysize(kTestFileData) - 1);
 
   base::RunLoop run_loop;
 
-  // We should get called OnSyncEnabled and OnWriteEnabled on kFile.
-  // (We quit the run loop when OnWriteEnabled is called on kFile)
+  // We should get called OnSyncEnabled on kFile.
   StrictMock<MockSyncStatusObserver> status_observer;
   EXPECT_CALL(status_observer, OnSyncEnabled(kFile))
       .Times(AtLeast(1));
-  EXPECT_CALL(status_observer, OnWriteEnabled(kFile))
-      .WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
   file_system_->AddSyncStatusObserver(&status_observer);
 
   // Creates and writes into a file.
   EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_->CreateFile(kFile));
   EXPECT_EQ(kTestFileDataSize,
             file_system_->WriteString(kFile, std::string(kTestFileData)));
 
   // Retrieve the file metadata to set up the expected values.
   base::PlatformFileInfo info;
   FilePath platform_path;
@@ skipping 12 matching lines @@
   // with ADD_OR_UPDATE change for TYPE_FILE.
   StrictMock<MockLocalChangeProcessor> local_change_processor;
   const FileChange change(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
                           fileapi::SYNC_FILE_TYPE_FILE);
   EXPECT_CALL(local_change_processor,
               ApplyLocalChange(change, platform_path, metadata, kFile, _))
       .WillOnce(MockStatusCallback(fileapi::SYNC_STATUS_OK));
 
   local_service_->ProcessLocalChange(
       &local_change_processor,
-      base::Bind(&OnSyncCompleted, FROM_HERE, base::Bind(&base::DoNothing),
+      base::Bind(&OnSyncCompleted, FROM_HERE, run_loop.QuitClosure(),
                  fileapi::SYNC_STATUS_OK, kFile));
 
   run_loop.Run();
 
   file_system_->RemoveSyncStatusObserver(&status_observer);
 
   EXPECT_EQ(0, GetNumChangesInTracker());
 }
 
 TEST_F(LocalFileSyncServiceTest, ProcessLocalChange_CreateAndRemoveFile) {
   const FileSystemURL kFile(file_system_->URL("foo"));
 
   base::RunLoop run_loop;
 
   // We should get called OnSyncEnabled and OnWriteEnabled on kFile.
-  // (We quit the run loop when OnWriteEnabled is called on kFile)
   StrictMock<MockSyncStatusObserver> status_observer;
   EXPECT_CALL(status_observer, OnSyncEnabled(kFile))
       .Times(AtLeast(1));
-  EXPECT_CALL(status_observer, OnWriteEnabled(kFile))
-      .WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
   file_system_->AddSyncStatusObserver(&status_observer);
 
   // Creates and then deletes a file.
   EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_->CreateFile(kFile));
   EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_->Remove(kFile, false));
 
   // The local_change_processor's ApplyLocalChange should be called once
   // with DELETE change for TYPE_FILE.
   // The file will NOT exist in the remote side and the processor might
   // return SYNC_FILE_ERROR_NOT_FOUND (as mocked).
   StrictMock<MockLocalChangeProcessor> local_change_processor;
   const FileChange change(FileChange::FILE_CHANGE_DELETE,
                           fileapi::SYNC_FILE_TYPE_FILE);
   EXPECT_CALL(local_change_processor, ApplyLocalChange(change, _, _, kFile, _))
       .WillOnce(MockStatusCallback(fileapi::SYNC_FILE_ERROR_NOT_FOUND));
 
   // The sync should succeed anyway.
   local_service_->ProcessLocalChange(
       &local_change_processor,
-      base::Bind(&OnSyncCompleted, FROM_HERE, base::Bind(&base::DoNothing),
+      base::Bind(&OnSyncCompleted, FROM_HERE, run_loop.QuitClosure(),
                  fileapi::SYNC_STATUS_OK, kFile));
 
   run_loop.Run();
 
   file_system_->RemoveSyncStatusObserver(&status_observer);
 
   EXPECT_EQ(0, GetNumChangesInTracker());
 }
 
 TEST_F(LocalFileSyncServiceTest, ProcessLocalChange_CreateAndRemoveDirectory) {
   const FileSystemURL kDir(file_system_->URL("foo"));
 
   base::RunLoop run_loop;
 
-  // OnSyncEnabled is expected to be called at least or more than once
-  // but OnWriteEnabled will never be called.
+  // OnSyncEnabled is expected to be called at least or more than once.
   StrictMock<MockSyncStatusObserver> status_observer;
   EXPECT_CALL(status_observer, OnSyncEnabled(kDir)).Times(AtLeast(1));
   file_system_->AddSyncStatusObserver(&status_observer);
 
   // Creates and then deletes a directory.
   EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_->CreateDirectory(kDir));
   EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_->Remove(kDir, false));
 
   // The local_change_processor's ApplyLocalChange should never be called.
   StrictMock<MockLocalChangeProcessor> local_change_processor;
@@ skipping 11 matching lines @@
 }
 
 TEST_F(LocalFileSyncServiceTest, ProcessLocalChange_MultipleChanges) {
   const FileSystemURL kPath(file_system_->URL("foo"));
   const FileSystemURL kOther(file_system_->URL("bar"));
 
   base::RunLoop run_loop;
 
   // We should get called OnSyncEnabled and OnWriteEnabled on kPath and
   // OnSyncEnabled on kOther.
-  // (We quit the run loop when OnWriteEnabled is called on kPath)
   StrictMock<MockSyncStatusObserver> status_observer;
   EXPECT_CALL(status_observer, OnSyncEnabled(kPath)).Times(AtLeast(1));
   EXPECT_CALL(status_observer, OnSyncEnabled(kOther)).Times(AtLeast(1));
-  EXPECT_CALL(status_observer, OnWriteEnabled(kPath))
-      .WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
   file_system_->AddSyncStatusObserver(&status_observer);
 
   // Creates a file, delete the file and creates a directory with the same
   // name.
   EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_->CreateFile(kPath));
   EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_->Remove(kPath, false));
   EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_->CreateDirectory(kPath));
 
   // Creates one more file.
   EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_->CreateFile(kOther));
 
   // The local_change_processor's ApplyLocalChange will be called
   // twice for FILE_TYPE and FILE_DIRECTORY.
   StrictMock<MockLocalChangeProcessor> local_change_processor;
   std::vector<FileChange> changes;
   EXPECT_CALL(local_change_processor, ApplyLocalChange(_, _, _, kPath, _))
       .Times(2)
       .WillOnce(MockStatusCallbackAndRecordChange(fileapi::SYNC_STATUS_OK,
                                                   &changes))
       .WillOnce(MockStatusCallbackAndRecordChange(fileapi::SYNC_STATUS_OK,
                                                   &changes));
 
   local_service_->ProcessLocalChange(
       &local_change_processor,
-      base::Bind(&OnSyncCompleted, FROM_HERE, base::Bind(&base::DoNothing),
+      base::Bind(&OnSyncCompleted, FROM_HERE, run_loop.QuitClosure(),
                  fileapi::SYNC_STATUS_OK, kPath));
 
   run_loop.Run();
 
   EXPECT_EQ(2U, changes.size());
   EXPECT_EQ(FileChange(FileChange::FILE_CHANGE_DELETE,
                        fileapi::SYNC_FILE_TYPE_FILE),
             changes[0]);
   EXPECT_EQ(FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
                        fileapi::SYNC_FILE_TYPE_DIRECTORY),
@@ skipping 29 matching lines @@
 
   EXPECT_EQ(fileapi::SYNC_STATUS_OK, status);
   EXPECT_EQ(kTime, metadata.last_modified);
   EXPECT_EQ(kSize, metadata.size);
 }
 
 // TODO(kinuko): Add tests for multiple file changes and multiple
 // FileSystemContexts.
 
 }  // namespace sync_file_system