Ports XMPP Invalidation code from drive_file_sync_service in /sync_file_system to /google_apis/driv…

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 180 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 369 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());

[tzik, 2013/04/16 09:14:10]

Could you add .RetiresOnSaturation(); since now we use WillOnce?

[calvinlo, 2013/04/16 09:27:51]

Done.

+  }
+
   // 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_;
 
@@ skipping 98 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);
 
   EXPECT_TRUE(metadata_store()->batch_sync_origins().empty());
   EXPECT_EQ(1u, metadata_store()->incremental_sync_origins().size());
   EXPECT_TRUE(pending_changes().empty());
@@ skipping 453 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