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

Unified Diff: sync/syncable/syncable_unittest.cc

Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort headers, update copyrights Created 8 years, 6 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
« no previous file with comments | « sync/syncable/syncable_mock.h ('k') | sync/test/engine/mock_connection_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/syncable/syncable_unittest.cc
diff --git a/sync/syncable/syncable_unittest.cc b/sync/syncable/syncable_unittest.cc
index ec02d802262e03601c9de879f6d548805a5907d6..e4eea387646a17573d05565bcfe1258fbcfe0f90 100644
--- a/sync/syncable/syncable_unittest.cc
+++ b/sync/syncable/syncable_unittest.cc
@@ -548,7 +548,7 @@ TEST_F(SyncableDirectoryTest, TakeSnapshotGetsMetahandlesToPurge) {
}
}
- syncable::ModelTypeSet to_purge(BOOKMARKS);
+ syncer::ModelTypeSet to_purge(BOOKMARKS);
dir_->PurgeEntriesWithTypeIn(to_purge);
Directory::SaveChangesSnapshot snapshot1;
@@ -829,8 +829,7 @@ TEST_F(SyncableDirectoryTest, TestGetUnsynced) {
TEST_F(SyncableDirectoryTest, TestGetUnappliedUpdates) {
std::vector<int64> handles;
int64 handle1, handle2;
- const syncable::FullModelTypeSet all_types =
- syncable::FullModelTypeSet::All();
+ const syncer::FullModelTypeSet all_types = syncer::FullModelTypeSet::All();
{
WriteTransaction trans(FROM_HERE, UNITTEST, dir_.get());
@@ -1396,7 +1395,7 @@ TEST_F(OnDiskSyncableDirectoryTest, TestPurgeEntriesWithTypeIn) {
dir_->set_initial_sync_ended_for_type(PREFERENCES, true);
dir_->set_initial_sync_ended_for_type(AUTOFILL, true);
- syncable::ModelTypeSet types_to_purge(PREFERENCES, AUTOFILL);
+ syncer::ModelTypeSet types_to_purge(PREFERENCES, AUTOFILL);
TestIdFactory id_factory;
// Create some items for each type.
@@ -1688,7 +1687,7 @@ TEST_F(OnDiskSyncableDirectoryTest, TestSaveChangesFailureWithPurge) {
SwapInUnsaveableDirectory();
ASSERT_TRUE(dir_->good());
- syncable::ModelTypeSet set(BOOKMARKS);
+ syncer::ModelTypeSet set(BOOKMARKS);
dir_->PurgeEntriesWithTypeIn(set);
EXPECT_TRUE(IsInMetahandlesToPurge(handle1));
ASSERT_FALSE(dir_->SaveChanges());
« no previous file with comments | « sync/syncable/syncable_mock.h ('k') | sync/test/engine/mock_connection_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698