Implement polling part of DriveFileSyncService

chrome/browser/sync_file_system/drive_file_sync_service_unittest.cc

Index: chrome/browser/sync_file_system/drive_file_sync_service_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_file_sync_service_unittest.cc b/chrome/browser/sync_file_system/drive_file_sync_service_unittest.cc
index f451ce81550cbfc603cb83d7c00f1c9558bcadc2..78846566d0e0e04d410a37b3546fe9b82727309e 100644
--- a/chrome/browser/sync_file_system/drive_file_sync_service_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_file_sync_service_unittest.cc
@@ -98,6 +98,7 @@ class DriveFileSyncServiceTest : public testing::Test {
 
     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());
@@ -258,7 +259,7 @@ class DriveFileSyncServiceTest : public testing::Test {
   }
 
   void AppendIncrementalRemoteChange(const GURL& origin,
-                                     google_apis::DocumentEntry* entry,
+                                     const google_apis::DocumentEntry& entry,
                                      int64 changestamp) {
     sync_service_->AppendNewRemoteChange(
         origin, entry, changestamp,
@@ -386,8 +387,8 @@ TEST_F(DriveFileSyncServiceTest, GetSyncRoot) {
 }
 
 TEST_F(DriveFileSyncServiceTest, BatchSyncOnInitialization) {
-  const GURL kOrigin1("http://example.com");
-  const GURL kOrigin2("http://hoge.example.com");
+  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(
@@ -439,7 +440,7 @@ TEST_F(DriveFileSyncServiceTest, BatchSyncOnInitialization) {
 }
 
 TEST_F(DriveFileSyncServiceTest, RegisterNewOrigin) {
-  const GURL kOrigin("http://example.com");
+  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/");
@@ -456,7 +457,8 @@ TEST_F(DriveFileSyncServiceTest, RegisterNewOrigin) {
 
   scoped_ptr<Value> origin_directory_not_found(LoadJSONFile(
       "sync_file_system/origin_directory_not_found.json"));
-  std::string query = FormatTitleQuery(kOrigin.spec());
+  std::string query = FormatTitleQuery(
+      DriveFileSyncClient::OriginToDirectoryTitle(kOrigin));
 
   EXPECT_CALL(*mock_drive_service(),
               GetDocuments(GURL(), 0, query, false, kSyncRootResourceId, _))
@@ -481,8 +483,8 @@ TEST_F(DriveFileSyncServiceTest, RegisterNewOrigin) {
 
   scoped_ptr<Value> origin_directory_created(LoadJSONFile(
       "sync_file_system/origin_directory_created.json"));
-  FilePath::StringType dirname =
-      FilePath().AppendASCII(kOrigin.spec()).value();
+  FilePath::StringType dirname = FilePath().AppendASCII(
+      DriveFileSyncClient::OriginToDirectoryTitle(kOrigin)).value();
   EXPECT_CALL(*mock_drive_service(),
               AddNewDirectory(kSyncRootContentURL, dirname, _))
       .WillOnce(InvokeGetDataCallback2(
@@ -520,7 +522,7 @@ TEST_F(DriveFileSyncServiceTest, RegisterNewOrigin) {
 }
 
 TEST_F(DriveFileSyncServiceTest, RegisterExistingOrigin) {
-  const GURL kOrigin("http://example.com");
+  const GURL kOrigin("chrome-extension://example");
   const std::string kDirectoryResourceId("folder:origin_directory_resource_id");
   const std::string kSyncRootResourceId("folder:sync_root_resource_id");
 
@@ -529,14 +531,15 @@ TEST_F(DriveFileSyncServiceTest, RegisterExistingOrigin) {
   EXPECT_CALL(*mock_remote_observer(),
               OnRemoteServiceStateUpdated(REMOTE_SERVICE_OK, _))
       .Times(AtLeast(1));
-  EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeAvailable(4))
+  EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeAvailable(_))
       .Times(AnyNumber());
 
   InSequence sequence;
 
   scoped_ptr<Value> origin_directory_found(LoadJSONFile(
       "sync_file_system/origin_directory_found.json"));
-  std::string query = FormatTitleQuery("http://example.com/");
+  std::string query = FormatTitleQuery(
+      DriveFileSyncClient::OriginToDirectoryTitle(kOrigin));
   EXPECT_CALL(*mock_drive_service(),
               GetDocuments(GURL(), 0, query, false, kSyncRootResourceId, _))
       .WillOnce(InvokeGetDataCallback5(
@@ -636,7 +639,7 @@ TEST_F(DriveFileSyncServiceTest, UnregisterOrigin) {
 
 TEST_F(DriveFileSyncServiceTest, ResolveSyncOperationType) {
   const fileapi::FileSystemURL url = fileapi::CreateSyncableFileSystemURL(
-      GURL("http://example.com/"),
+      GURL("chrome-extension://example/"),
       DriveFileSyncService::kServiceName,
       FilePath().AppendASCII("path/to/file"));
   const std::string kResourceId("123456");
@@ -654,6 +657,8 @@ TEST_F(DriveFileSyncServiceTest, ResolveSyncOperationType) {
   EXPECT_CALL(*mock_remote_observer(),
               OnRemoteServiceStateUpdated(REMOTE_SERVICE_OK, _))
       .Times(1);
+  EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeAvailable(_))
+      .Times(AnyNumber());
 
   SetUpDriveSyncService();
   message_loop()->RunUntilIdle();
@@ -734,7 +739,7 @@ TEST_F(DriveFileSyncServiceTest, RemoteChange_NoChange) {
 }
 
 TEST_F(DriveFileSyncServiceTest, RemoteChange_Busy) {
-  const GURL kOrigin("chrome-extension://example.com");
+  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"));
@@ -757,7 +762,7 @@ TEST_F(DriveFileSyncServiceTest, RemoteChange_Busy) {
 
   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),
@@ -765,7 +770,7 @@ TEST_F(DriveFileSyncServiceTest, RemoteChange_Busy) {
 }
 
 TEST_F(DriveFileSyncServiceTest, RemoteChange_NewFile) {
-  const GURL kOrigin("chrome-extension://example.com");
+  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"));
@@ -803,7 +808,7 @@ TEST_F(DriveFileSyncServiceTest, RemoteChange_NewFile) {
 
   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),
@@ -811,7 +816,7 @@ TEST_F(DriveFileSyncServiceTest, RemoteChange_NewFile) {
 }
 
 TEST_F(DriveFileSyncServiceTest, RemoteChange_UpdateFile) {
-  const GURL kOrigin("chrome-extension://example.com");
+  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"));
@@ -849,7 +854,7 @@ TEST_F(DriveFileSyncServiceTest, RemoteChange_UpdateFile) {
 
   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);