Call batch/incremental fetch with more strict conditions

chrome/browser/sync_file_system/drive_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 "chrome/browser/sync_file_system/drive_file_sync_service.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
@@ skipping 18 matching lines @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #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::InSequence;
+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;
 using extensions::DictionaryBuilder;
@@ skipping 519 matching lines @@
       "folder:origin_directory_resource_id");
   const std::string kDirectoryResourceId2(
       "folder:origin_directory_resource_id2");
   const std::string kSyncRootResourceId("folder:sync_root_resource_id");
 
   metadata_store()->SetSyncRootDirectory(kSyncRootResourceId);
   metadata_store()->AddBatchSyncOrigin(kOrigin1, kDirectoryResourceId1);
   metadata_store()->AddBatchSyncOrigin(kOrigin2, kDirectoryResourceId2);
   metadata_store()->MoveBatchSyncOriginToIncremental(kOrigin2);
 
+  Sequence change_queue_seq;
+  EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(0))
+      .InSequence(change_queue_seq);
   EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(3))
-      .Times(AnyNumber());
+      .InSequence(change_queue_seq);
 
   InSequence sequence;
 
   SetUpDriveServiceExpectCallsForGetAccountMetadata();
   SetUpDriveServiceExpectCallsForGetResourceList(
       "sync_file_system/listing_files_in_directory.json",
       std::string(),
       kDirectoryResourceId1);
 
   EXPECT_CALL(*mock_remote_observer(),
@@ skipping 480 matching lines @@
       kOrigin, kFilePath, true /* is_deleted */,
       kFileResourceId2, 7, "deleted_file_md5"));
   EXPECT_TRUE(AppendIncrementalRemoteChange(
       kOrigin, kFilePath, false /* is_deleted */,
       kFileResourceId, 8, "updated_file_md5"));
 }
 
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace sync_file_system