Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(269)

Unified Diff: chrome/browser/sync_file_system/drive_file_sync_service_unittest.cc

Issue 11665029: Sync FileSystem: Mark empty batch sync origin as incremental sync origin. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert android exclusion Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..850833fd6e2ce03b1ed6bf06e8cf9be2f52f5896 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
@@ -187,8 +187,8 @@ class DriveFileSyncServiceTest : public testing::Test {
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);
@@ -548,8 +548,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());
}

Powered by Google App Engine
This is Rietveld 408576698