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 169 matching lines @@
     typedef DriveFileSyncService::ChangeQueueItem ChangeQueueItem;
     typedef DriveFileSyncService::RemoteSyncType RemoteSyncType;
     sync_service_->pending_changes_.clear();
 
     RemoteSyncType sync_type = DriveFileSyncService::REMOTE_SYNC_TYPE_BATCH;
     std::pair<iterator, bool> inserted_to_queue =
         sync_service_->pending_changes_.insert(
             ChangeQueueItem(changestamp, sync_type, url));
     DCHECK(inserted_to_queue.second);
 
-    DriveFileSyncService::PathToChange* path_to_change =
-        &sync_service_->url_to_change_[url.origin()];
+    DriveFileSyncService::PathToChangeMap* path_to_change =
+        &sync_service_->origin_to_changes_map_[url.origin()];
     (*path_to_change)[url.path()] = DriveFileSyncService::RemoteChange(
         changestamp, resource_id, sync_type, url, file_change,
         inserted_to_queue.first);
   }
 
   DriveFileSyncClient* sync_client() {
     if (sync_client_)
       return sync_client_.get();
     return sync_service_->sync_client_.get();
   }
@@ skipping 339 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 372 matching lines @@
       *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