Sync FileSystem: Add default mock expectation for MockDriveService::GetChangeList

chrome/browser/sync_file_system/drive_file_sync_service_mock_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 "chrome/browser/sync_file_system/drive_file_sync_service.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
@@ skipping 23 matching lines @@
 #include "webkit/fileapi/syncable/sync_file_metadata.h"
 #include "webkit/fileapi/syncable/syncable_file_system_util.h"
 
 #define FPL(x) FILE_PATH_LITERAL(x)
 
 using ::testing::AnyNumber;
 using ::testing::AtLeast;
 using ::testing::AtMost;
 using ::testing::InSequence;
 using ::testing::Return;
+using ::testing::NiceMock;
 using ::testing::Sequence;
 using ::testing::StrictMock;
 using ::testing::_;
 
 using google_apis::ResourceEntry;
 using google_apis::DriveServiceInterface;
 using google_apis::DriveUploaderInterface;
 using google_apis::test_util::LoadJSONFile;
 
 using extensions::Extension;
@@ skipping 143 matching lines @@
 ACTION(InvokeDidDownloadFile) {
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE, base::Bind(arg3, google_apis::HTTP_SUCCESS, arg1));
 }
 
 ACTION(InvokeDidApplyRemoteChange) {
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE, base::Bind(arg3, SYNC_STATUS_OK));
 }
 
-ACTION(InvokeGetChangeListWithEmptyChange) {
-  scoped_ptr<google_apis::ResourceList> resource_list(
-      new google_apis::ResourceList());
-  base::MessageLoopProxy::current()->PostTask(
-      FROM_HERE, base::Bind(arg1, google_apis::HTTP_SUCCESS,
-                            base::Passed(&resource_list)));
-}
-
 }  // namespace
 
 class MockRemoteServiceObserver : public RemoteFileSyncService::Observer {
  public:
   MockRemoteServiceObserver() {}
   virtual ~MockRemoteServiceObserver() {}
 
   // LocalChangeProcessor override.
   MOCK_METHOD1(OnRemoteChangeQueueUpdated,
                void(int64 pending_changes));
@@ skipping 32 matching lines @@
     extension_system->CreateExtensionService(
         CommandLine::ForCurrentProcess(), base::FilePath(), false);
     extension_service_ = extension_system->Get(
         profile_.get())->extension_service();
 
     AddTestExtension(extension_service_, FPL("example1"));
     AddTestExtension(extension_service_, FPL("example2"));
 
     ASSERT_TRUE(RegisterSyncableFileSystem(kServiceName));
 
-    mock_drive_service_ = new StrictMock<google_apis::MockDriveService>;
+    mock_drive_service_ = new NiceMock<google_apis::MockDriveService>;
 
     EXPECT_CALL(*mock_drive_service(), Initialize(profile_.get()));
     EXPECT_CALL(*mock_drive_service(), AddObserver(_));
 
     // Expect to call GetRootResourceId and RemoveResourceFromDirectory to
     // ensure the sync root directory is not in 'My Drive' directory.
     EXPECT_CALL(*mock_drive_service(), GetRootResourceId())
         .WillRepeatedly(Return(kRootResourceId));
     EXPECT_CALL(*mock_drive_service(),
                 RemoveResourceFromDirectory(kRootResourceId, _, _))
@@ skipping 152 matching lines @@
       return sync_client_.get();
     return sync_service_->sync_client_.get();
   }
 
   DriveMetadataStore* metadata_store() {
     if (metadata_store_)
       return metadata_store_.get();
     return sync_service_->metadata_store_.get();
   }
 
-  StrictMock<google_apis::MockDriveService>* mock_drive_service() {
+  NiceMock<google_apis::MockDriveService>* mock_drive_service() {
     return mock_drive_service_;
   }
 
   StrictMock<MockRemoteServiceObserver>* mock_remote_observer() {
     return &mock_remote_observer_;
   }
 
   StrictMock<MockFileStatusObserver>* mock_file_status_observer() {
     return &mock_file_status_observer_;
   }
@@ skipping 176 matching lines @@
         = google_apis::ResourceEntry::ExtractAndParse(
             *origin_directory_created_value);
     EXPECT_CALL(*mock_drive_service(),
                 AddNewDirectory(parent_directory, directory_name, _))
         .WillOnce(InvokeGetResourceEntryCallback2(
             google_apis::HTTP_SUCCESS,
             base::Passed(&origin_directory_created)))
         .RetiresOnSaturation();
   }
 
-  void SetUpDriveServiceExpectCallsForEmptyRemoteChange() {
-    EXPECT_CALL(*mock_drive_service(),
-                GetChangeList(_, _))
-        .WillOnce(InvokeGetChangeListWithEmptyChange())
-        .RetiresOnSaturation();
-  }
-
   // End of mock setup helpers -----------------------------------------------
 
  private:
   MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
 
   base::ScopedTempDir base_dir_;
   scoped_ptr<TestingProfile> profile_;
 
   scoped_ptr<DriveFileSyncService> sync_service_;
 
   // Not owned.
   ExtensionService* extension_service_;
 
   // Owned by |sync_client_|.
-  StrictMock<google_apis::MockDriveService>* mock_drive_service_;
+  NiceMock<google_apis::MockDriveService>* mock_drive_service_;
 
   StrictMock<MockRemoteServiceObserver> mock_remote_observer_;
   StrictMock<MockFileStatusObserver> mock_file_status_observer_;
   StrictMock<MockRemoteChangeProcessor> mock_remote_processor_;
 
   scoped_ptr<DriveFileSyncClient> sync_client_;
   scoped_ptr<DriveMetadataStore> metadata_store_;
 
   DISALLOW_COPY_AND_ASSIGN(DriveFileSyncServiceMockTest);
 };
@@ skipping 83 matching lines @@
       DriveFileSyncClient::OriginToDirectoryTitle(kOrigin));
 
   // Once the directory is created GetAboutResource should be called to get
   // the largest changestamp for the origin as a prepariation of the batch sync.
   SetUpDriveServiceExpectCallsForGetAboutResource();
 
   SetUpDriveServiceExpectCallsForGetResourceListInDirectory(
       "chromeos/sync_file_system/listing_files_in_empty_directory.json",
       kDirectoryResourceId);
 
-  SetUpDriveServiceExpectCallsForEmptyRemoteChange();
-
   SetUpDriveSyncService(true);
   bool done = false;
   sync_service()->RegisterOriginForTrackingChanges(
       kOrigin, base::Bind(&ExpectEqStatus, &done, SYNC_STATUS_OK));
   message_loop()->RunUntilIdle();
   EXPECT_TRUE(done);
 
   VerifySizeOfRegisteredOrigins(0u, 1u, 0u);
   EXPECT_TRUE(pending_changes().empty());
 }
@@ skipping 526 matching lines @@
   entry->set_kind(google_apis::ENTRY_KIND_FOLDER);
 
   // Expect to drop this change for file.
   EXPECT_FALSE(AppendIncrementalRemoteChangeByEntry(
       kOrigin, *entry, 1));
 }
 
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace sync_file_system