Sync FileSystem: Mark empty batch sync origin as incremental sync origin.

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 edbc6698aa4e10a653b209beb66b2892ef42a767..911b4715267aa3dd5e2103e92f021b971e7e794e 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
@@ -368,8 +368,6 @@ ACTION(InvokeDidApplyRemoteChange) {
       FROM_HERE, base::Bind(arg3, fileapi::SYNC_STATUS_OK));
 }
 
-#if !defined(OS_ANDROID)

[kinuko, 2013/01/04 10:38:54]

This change looks irrelevant?

[tzik, 2013/01/07 08:37:55]

Reverted. It's not related to the change.

-
 TEST_F(DriveFileSyncServiceTest, GetSyncRoot) {
   scoped_ptr<Value> sync_root_found_value(LoadJSONFile(
       "sync_file_system/sync_root_found.json"));
@@ -548,8 +546,8 @@ TEST_F(DriveFileSyncServiceTest, RegisterNewOrigin) {
   message_loop()->RunUntilIdle();
   EXPECT_TRUE(done);
 
-  EXPECT_EQ(1u, metadata_store()->batch_sync_origins().size());
-  EXPECT_TRUE(metadata_store()->incremental_sync_origins().empty());
+  EXPECT_TRUE(metadata_store()->batch_sync_origins().empty());
+  EXPECT_EQ(1u, metadata_store()->incremental_sync_origins().size());
   EXPECT_TRUE(pending_changes().empty());
 }
 
@@ -939,6 +937,4 @@ TEST_F(DriveFileSyncServiceTest, RemoteChange_UpdateFile) {
                       fileapi::SYNC_OPERATION_UPDATED);
 }
 
-#endif  // !defined(OS_ANDROID)
-
 }  // namespace sync_file_system