Implement polling part of DriveFileSyncService

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/message_loop.h"
 #include "base/message_loop_proxy.h"
@@ skipping 56 matching lines @@
 }
 
 }  // namespace
 
 class MockRemoteServiceObserver : public RemoteFileSyncService::Observer {
  public:
   MockRemoteServiceObserver() {}
   virtual ~MockRemoteServiceObserver() {}
 
   // LocalChangeProcessor override.
-  MOCK_METHOD1(OnRemoteChangeAvailable,
+  MOCK_METHOD1(OnRemoteChangeQueueUpdated,
                void(int64 pending_changes));
   MOCK_METHOD2(OnRemoteServiceStateUpdated,
                void(RemoteServiceState state,
                     const std::string& description));
 };
 
 class DriveFileSyncServiceTest : public testing::Test {
  public:
   DriveFileSyncServiceTest()
       : file_thread_(content::BrowserThread::FILE, &message_loop_),
         mock_drive_service_(NULL) {
   }
 
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(fileapi::RegisterSyncableFileSystem(
         DriveFileSyncService::kServiceName));
 
     mock_drive_service_ = new StrictMock<google_apis::MockDriveService>;
 
     EXPECT_CALL(*mock_drive_service(), Initialize(&profile_));
     EXPECT_CALL(*mock_drive_service(), AddObserver(_));
 
     sync_client_ = DriveFileSyncClient::CreateForTesting(
         &profile_,
+        GURL(google_apis::GDataWapiUrlGenerator::kBaseUrlForProduction),
         scoped_ptr<DriveServiceInterface>(mock_drive_service_),
         scoped_ptr<DriveUploaderInterface>()).Pass();
     ASSERT_TRUE(base_dir_.CreateUniqueTempDir());
     metadata_store_.reset(new DriveMetadataStore(
         base_dir_.path(), base::MessageLoopProxy::current()));
 
     bool done = false;
     metadata_store_->Initialize(base::Bind(&DidInitialize, &done));
     message_loop_.RunUntilIdle();
     EXPECT_TRUE(done);
@@ skipping 141 matching lines @@
                               fileapi::SyncOperationType* operation_out,
                               fileapi::SyncStatusCode status,
                               const fileapi::FileSystemURL& url,
                               fileapi::SyncOperationType operation) {
     *status_out = status;
     *url_out = url;
     *operation_out = operation;
   }
 
   void AppendIncrementalRemoteChange(const GURL& origin,
-                                     google_apis::DocumentEntry* entry,
+                                     const google_apis::DocumentEntry& entry,
                                      int64 changestamp) {
     sync_service_->AppendNewRemoteChange(
         origin, entry, changestamp,
         DriveFileSyncService::REMOTE_SYNC_TYPE_INCREMENTAL);
   }
 
  private:
   MessageLoop message_loop_;
   content::TestBrowserThread file_thread_;
 
@@ skipping 92 matching lines @@
   std::string query = FormatTitleQuery(kSyncRootDirectoryName);
   EXPECT_CALL(*mock_drive_service(),
               GetDocuments(GURL(), 0, query, false, std::string(), _))
       .WillOnce(InvokeGetDataCallback5(
           google_apis::HTTP_SUCCESS,
           base::Passed(&sync_root_found)));
 
   EXPECT_CALL(*mock_remote_observer(),
               OnRemoteServiceStateUpdated(REMOTE_SERVICE_OK, _))
       .Times(1);
-  EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeAvailable(0))
+  EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(0))
       .Times(AnyNumber());
 
   SetUpDriveSyncService();
   message_loop()->RunUntilIdle();
 
   EXPECT_EQ("folder:sync_root_resource_id",
             metadata_store()->sync_root_directory());
 
   EXPECT_EQ(0u, metadata_store()->batch_sync_origins().size());
   EXPECT_EQ(0u, metadata_store()->incremental_sync_origins().size());
   EXPECT_EQ(0u, pending_changes().size());
 }
 
 TEST_F(DriveFileSyncServiceTest, BatchSyncOnInitialization) {
   const GURL kOrigin1("chrome-extension://example");
   const GURL kOrigin2("chrome-extension://example2");
   const std::string kDirectoryResourceId1(
       "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);
 
-  EXPECT_CALL(*mock_remote_observer(),
-              OnRemoteChangeAvailable(4))
+  EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(4))
       .Times(AnyNumber());
 
   InSequence sequence;
 
   scoped_ptr<Value> account_metadata(LoadJSONFile(
       "gdata/account_metadata.json"));
   EXPECT_CALL(*mock_drive_service(),
               GetAccountMetadata(_))
       .WillOnce(InvokeGetDataCallback0(
           google_apis::HTTP_SUCCESS,
@@ skipping 28 matching lines @@
   const GURL kOrigin("chrome-extension://example");
   const std::string kDirectoryResourceId("folder:origin_directory_resource_id");
   const std::string kSyncRootResourceId("folder:sync_root_resource_id");
   const GURL kSyncRootContentURL("https://sync_root_content_url/");
 
   metadata_store()->SetSyncRootDirectory(kSyncRootResourceId);
 
   EXPECT_CALL(*mock_remote_observer(),
               OnRemoteServiceStateUpdated(REMOTE_SERVICE_OK, _))
       .Times(AtLeast(1));
-  EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeAvailable(0))
+  EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(0))
       .Times(AnyNumber());
 
   InSequence sequence;
 
   scoped_ptr<Value> origin_directory_not_found(LoadJSONFile(
       "sync_file_system/origin_directory_not_found.json"));
   std::string query = FormatTitleQuery(
       DriveFileSyncClient::OriginToDirectoryTitle(kOrigin));
 
   EXPECT_CALL(*mock_drive_service(),
@@ skipping 60 matching lines @@
 TEST_F(DriveFileSyncServiceTest, RegisterExistingOrigin) {
   const GURL kOrigin("chrome-extension://example");
   const std::string kDirectoryResourceId("folder:origin_directory_resource_id");
   const std::string kSyncRootResourceId("folder:sync_root_resource_id");
 
   metadata_store()->SetSyncRootDirectory(kSyncRootResourceId);
 
   EXPECT_CALL(*mock_remote_observer(),
               OnRemoteServiceStateUpdated(REMOTE_SERVICE_OK, _))
       .Times(AtLeast(1));
-  EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeAvailable(4))
+  EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
       .Times(AnyNumber());
 
   InSequence sequence;
 
   scoped_ptr<Value> origin_directory_found(LoadJSONFile(
       "sync_file_system/origin_directory_found.json"));
   std::string query = FormatTitleQuery(
       DriveFileSyncClient::OriginToDirectoryTitle(kOrigin));
   EXPECT_CALL(*mock_drive_service(),
               GetDocuments(GURL(), 0, query, false, kSyncRootResourceId, _))
@@ skipping 45 matching lines @@
   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);
 
   EXPECT_CALL(*mock_remote_observer(),
               OnRemoteServiceStateUpdated(REMOTE_SERVICE_OK, _))
       .Times(AtLeast(1));
-  EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeAvailable(_))
+  EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
       .Times(AnyNumber());
 
   InSequence sequence;
 
   scoped_ptr<Value> account_metadata(LoadJSONFile(
       "gdata/account_metadata.json"));
   EXPECT_CALL(*mock_drive_service(),
               GetAccountMetadata(_))
       .WillOnce(InvokeGetDataCallback0(
           google_apis::HTTP_SUCCESS,
@@ skipping 39 matching lines @@
   std::string query = FormatTitleQuery(kSyncRootDirectoryName);
   EXPECT_CALL(*mock_drive_service(),
               GetDocuments(GURL(), 0, query, false, std::string(), _))
       .WillOnce(InvokeGetDataCallback5(
           google_apis::HTTP_SUCCESS,
           base::Passed(&sync_root_found)));
 
   EXPECT_CALL(*mock_remote_observer(),
               OnRemoteServiceStateUpdated(REMOTE_SERVICE_OK, _))
       .Times(1);
+  EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
+      .Times(AnyNumber());
 
   SetUpDriveSyncService();
   message_loop()->RunUntilIdle();
 
   const fileapi::FileChange local_add_or_update_change(
       fileapi::FileChange::FILE_CHANGE_ADD_OR_UPDATE,
       fileapi::SYNC_FILE_TYPE_FILE);
   const fileapi::FileChange local_delete_change(
       fileapi::FileChange::FILE_CHANGE_DELETE,
       fileapi::SYNC_FILE_TYPE_FILE);
@@ skipping 46 matching lines @@
 }
 
 TEST_F(DriveFileSyncServiceTest, RemoteChange_NoChange) {
   const std::string kSyncRootResourceId("folder:sync_root_resource_id");
 
   metadata_store()->SetSyncRootDirectory(kSyncRootResourceId);
 
   EXPECT_CALL(*mock_remote_observer(),
               OnRemoteServiceStateUpdated(REMOTE_SERVICE_OK, _))
       .Times(AnyNumber());
-  EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeAvailable(_))
+  EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
       .Times(AnyNumber());
 
   SetUpDriveSyncService();
 
   ProcessRemoteChange(fileapi::SYNC_STATUS_NO_CHANGE_TO_SYNC,
                       fileapi::FileSystemURL(),
                       fileapi::SYNC_OPERATION_NONE);
   EXPECT_TRUE(metadata_store()->batch_sync_origins().empty());
   EXPECT_TRUE(metadata_store()->incremental_sync_origins().empty());
   EXPECT_TRUE(pending_changes().empty());
 }
 
 TEST_F(DriveFileSyncServiceTest, RemoteChange_Busy) {
   const GURL kOrigin("chrome-extension://example");
   const std::string kDirectoryResourceId("folder:origin_directory_resource_id");
   const std::string kSyncRootResourceId("folder:sync_root_resource_id");
   const FilePath::StringType kFileName(FPL("File 1.mp3"));
 
   metadata_store()->SetSyncRootDirectory(kSyncRootResourceId);
   metadata_store()->AddBatchSyncOrigin(kOrigin, kDirectoryResourceId);
   metadata_store()->MoveBatchSyncOriginToIncremental(kOrigin);
 
   EXPECT_CALL(*mock_remote_observer(),
               OnRemoteServiceStateUpdated(REMOTE_SERVICE_OK, _))
       .Times(AnyNumber());
-  EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeAvailable(_))
+  EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
       .Times(AnyNumber());
 
   EXPECT_CALL(*mock_remote_processor(),
               PrepareForProcessRemoteChange(CreateURL(kOrigin, kFileName), _))
       .WillOnce(PrepareForRemoteChange_Busy());
 
   SetUpDriveSyncService();
 
   scoped_ptr<DocumentEntry> entry(DocumentEntry::ExtractAndParse(
       *LoadJSONFile("gdata/file_entry.json")));
-  AppendIncrementalRemoteChange(kOrigin, entry.get(), 12345);
+  AppendIncrementalRemoteChange(kOrigin, *entry, 12345);
 
   ProcessRemoteChange(fileapi::SYNC_STATUS_FILE_BUSY,
                       CreateURL(kOrigin, kFileName),
                       fileapi::SYNC_OPERATION_NONE);
 }
 
 TEST_F(DriveFileSyncServiceTest, RemoteChange_NewFile) {
   const GURL kOrigin("chrome-extension://example");
   const std::string kDirectoryResourceId("folder:origin_directory_resource_id");
   const std::string kSyncRootResourceId("folder:sync_root_resource_id");
   const FilePath::StringType kFileName(FPL("File 1.mp3"));
   const std::string kFileResourceId("file:2_file_resource_id");
 
   metadata_store()->SetSyncRootDirectory(kSyncRootResourceId);
   metadata_store()->AddBatchSyncOrigin(kOrigin, kDirectoryResourceId);
   metadata_store()->MoveBatchSyncOriginToIncremental(kOrigin);
 
   EXPECT_CALL(*mock_remote_observer(),
               OnRemoteServiceStateUpdated(REMOTE_SERVICE_OK, _))
       .Times(AnyNumber());
-  EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeAvailable(_))
+  EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
       .Times(AnyNumber());
 
   EXPECT_CALL(*mock_remote_processor(),
               PrepareForProcessRemoteChange(CreateURL(kOrigin, kFileName), _))
       .WillOnce(PrepareForRemoteChange_NotFound());
 
   scoped_ptr<Value> file_entry(LoadJSONFile("gdata/file_entry.json").Pass());
   EXPECT_CALL(*mock_drive_service(),
               GetDocumentEntry(kFileResourceId, _))
       .WillOnce(InvokeGetDataCallback1(google_apis::HTTP_SUCCESS,
                                        base::Passed(&file_entry)));
 
   EXPECT_CALL(*mock_drive_service(),
               DownloadFile(_, _, GURL("https://file_content_url"), _, _))
       .WillOnce(InvokeDidDownloadFile());
 
   EXPECT_CALL(*mock_remote_processor(),
               ApplyRemoteChange(_, _, CreateURL(kOrigin, kFileName), _))
       .WillOnce(InvokeDidApplyRemoteChange());
 
   SetUpDriveSyncService();
 
   scoped_ptr<DocumentEntry> entry(DocumentEntry::ExtractAndParse(
       *LoadJSONFile("gdata/file_entry.json")));
-  AppendIncrementalRemoteChange(kOrigin, entry.get(), 12345);
+  AppendIncrementalRemoteChange(kOrigin, *entry, 12345);
 
   ProcessRemoteChange(fileapi::SYNC_STATUS_OK,
                       CreateURL(kOrigin, kFileName),
                       fileapi::SYNC_OPERATION_ADD);
 }
 
 TEST_F(DriveFileSyncServiceTest, RemoteChange_UpdateFile) {
   const GURL kOrigin("chrome-extension://example");
   const std::string kDirectoryResourceId("folder:origin_directory_resource_id");
   const std::string kSyncRootResourceId("folder:sync_root_resource_id");
   const FilePath::StringType kFileName(FPL("File 1.mp3"));
   const std::string kFileResourceId("file:2_file_resource_id");
 
   metadata_store()->SetSyncRootDirectory(kSyncRootResourceId);
   metadata_store()->AddBatchSyncOrigin(kOrigin, kDirectoryResourceId);
   metadata_store()->MoveBatchSyncOriginToIncremental(kOrigin);
 
   EXPECT_CALL(*mock_remote_observer(),
               OnRemoteServiceStateUpdated(REMOTE_SERVICE_OK, _))
       .Times(AnyNumber());
-  EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeAvailable(_))
+  EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
       .Times(AnyNumber());
 
   EXPECT_CALL(*mock_remote_processor(),
               PrepareForProcessRemoteChange(CreateURL(kOrigin, kFileName), _))
       .WillOnce(PrepareForRemoteChange_NotModified());
 
   scoped_ptr<Value> file_entry(LoadJSONFile("gdata/file_entry.json").Pass());
   EXPECT_CALL(*mock_drive_service(),
               GetDocumentEntry(kFileResourceId, _))
       .WillOnce(InvokeGetDataCallback1(google_apis::HTTP_SUCCESS,
                                        base::Passed(&file_entry)));
 
   EXPECT_CALL(*mock_drive_service(),
               DownloadFile(_, _, GURL("https://file_content_url"), _, _))
       .WillOnce(InvokeDidDownloadFile());
 
   EXPECT_CALL(*mock_remote_processor(),
               ApplyRemoteChange(_, _, CreateURL(kOrigin, kFileName), _))
       .WillOnce(InvokeDidApplyRemoteChange());
 
   SetUpDriveSyncService();
 
   scoped_ptr<DocumentEntry> entry(DocumentEntry::ExtractAndParse(
       *LoadJSONFile("gdata/file_entry.json")));
-  AppendIncrementalRemoteChange(kOrigin, entry.get(), 12345);
+  AppendIncrementalRemoteChange(kOrigin, *entry, 12345);
   ProcessRemoteChange(fileapi::SYNC_STATUS_OK,
                       CreateURL(kOrigin, kFileName),
                       fileapi::SYNC_OPERATION_UPDATE);
 }
 
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace sync_file_system