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

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 350 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, 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"));
   scoped_ptr<google_apis::ResourceList> sync_root_found(
       google_apis::ResourceList::ExtractAndParse(*sync_root_found_value));
   std::string query = FormatTitleQuery(kSyncRootDirectoryName);
   EXPECT_CALL(*mock_drive_service(),
               GetResourceList(GURL(), 0, query, false, std::string(), _))
       .WillOnce(InvokeGetResourceListCallback5(
           google_apis::HTTP_SUCCESS,
@@ skipping 158 matching lines @@
           google_apis::HTTP_SUCCESS,
           base::Passed(&listing_files_in_empty_directory)));
 
   SetUpDriveSyncService();
   bool done = false;
   sync_service()->RegisterOriginForTrackingChanges(
       kOrigin, base::Bind(&ExpectEqStatus, &done, fileapi::SYNC_STATUS_OK));
   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());
 }
 
 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);
 
@@ skipping 369 matching lines @@
   SetUpDriveSyncService();
 
   scoped_ptr<ResourceEntry> entry(ResourceEntry::ExtractAndParse(
       *LoadJSONFile("gdata/file_entry.json")));
   AppendIncrementalRemoteChange(kOrigin, *entry, 12345);
   ProcessRemoteChange(fileapi::SYNC_STATUS_OK,
                       CreateURL(kOrigin, kFileName),
                       fileapi::SYNC_OPERATION_UPDATED);
 }
 
-#endif  // !defined(OS_ANDROID)
-
 }  // namespace sync_file_system