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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/backend_migrator_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 | « chrome/browser/sync/backend_migrator.cc ('k') | chrome/browser/sync/failed_datatypes_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/backend_migrator_unittest.cc
diff --git a/chrome/browser/sync/backend_migrator_unittest.cc b/chrome/browser/sync/backend_migrator_unittest.cc
index 3861fe69d0642849ac36da51a383d3229bbe48c8..7331072811eb7d49dfd12c3fac0437cf488ccc87 100644
--- a/chrome/browser/sync/backend_migrator_unittest.cc
+++ b/chrome/browser/sync/backend_migrator_unittest.cc
@@ -36,9 +36,9 @@ class SyncBackendMigratorTest : public testing::Test {
test_user_share_.SetUp();
Mock::VerifyAndClear(manager());
Mock::VerifyAndClear(&service_);
- preferred_types_.Put(syncable::BOOKMARKS);
- preferred_types_.Put(syncable::PREFERENCES);
- preferred_types_.Put(syncable::AUTOFILL);
+ preferred_types_.Put(syncer::BOOKMARKS);
+ preferred_types_.Put(syncer::PREFERENCES);
+ preferred_types_.Put(syncer::AUTOFILL);
ON_CALL(service_, GetPreferredDataTypes()).
WillByDefault(Return(preferred_types_));
@@ -47,7 +47,7 @@ class SyncBackendMigratorTest : public testing::Test {
new BackendMigrator(
"Profile0", test_user_share_.user_share(), service(), manager(),
base::Closure()));
- SetUnsyncedTypes(syncable::ModelTypeSet());
+ SetUnsyncedTypes(syncer::ModelTypeSet());
}
virtual void TearDown() {
@@ -57,12 +57,12 @@ class SyncBackendMigratorTest : public testing::Test {
// Marks all types in |unsynced_types| as unsynced and all other
// types as synced.
- void SetUnsyncedTypes(syncable::ModelTypeSet unsynced_types) {
+ void SetUnsyncedTypes(syncer::ModelTypeSet unsynced_types) {
syncer::WriteTransaction trans(FROM_HERE,
test_user_share_.user_share());
- for (int i = syncable::FIRST_REAL_MODEL_TYPE;
- i < syncable::MODEL_TYPE_COUNT; ++i) {
- syncable::ModelType type = syncable::ModelTypeFromInt(i);
+ for (int i = syncer::FIRST_REAL_MODEL_TYPE;
+ i < syncer::MODEL_TYPE_COUNT; ++i) {
+ syncer::ModelType type = syncer::ModelTypeFromInt(i);
sync_pb::DataTypeProgressMarker progress_marker;
if (!unsynced_types.Has(type)) {
progress_marker.set_token("dummy");
@@ -72,7 +72,7 @@ class SyncBackendMigratorTest : public testing::Test {
}
void SendConfigureDone(DataTypeManager::ConfigureStatus status,
- syncable::ModelTypeSet requested_types) {
+ syncer::ModelTypeSet requested_types) {
if (status == DataTypeManager::OK) {
DataTypeManager::ConfigureResult result(status, requested_types);
migrator_->OnConfigureDone(result);
@@ -82,7 +82,7 @@ class SyncBackendMigratorTest : public testing::Test {
status,
requested_types,
errors,
- syncable::ModelTypeSet());
+ syncer::ModelTypeSet());
migrator_->OnConfigureDone(result);
}
message_loop_.RunAllPending();
@@ -90,9 +90,9 @@ class SyncBackendMigratorTest : public testing::Test {
ProfileSyncService* service() { return &service_; }
DataTypeManagerMock* manager() { return &manager_; }
- syncable::ModelTypeSet preferred_types() { return preferred_types_; }
+ syncer::ModelTypeSet preferred_types() { return preferred_types_; }
BackendMigrator* migrator() { return migrator_.get(); }
- void RemovePreferredType(syncable::ModelType type) {
+ void RemovePreferredType(syncer::ModelType type) {
preferred_types_.Remove(type);
Mock::VerifyAndClear(&service_);
ON_CALL(service_, GetPreferredDataTypes()).
@@ -102,7 +102,7 @@ class SyncBackendMigratorTest : public testing::Test {
private:
scoped_ptr<SyncSessionSnapshot> snap_;
MessageLoop message_loop_;
- syncable::ModelTypeSet preferred_types_;
+ syncer::ModelTypeSet preferred_types_;
NiceMock<ProfileSyncServiceMock> service_;
NiceMock<DataTypeManagerMock> manager_;
syncer::TestUserShare test_user_share_;
@@ -123,10 +123,10 @@ TEST_F(SyncBackendMigratorTest, Sanity) {
migrator()->AddMigrationObserver(&migration_observer);
EXPECT_CALL(migration_observer, OnMigrationStateChange()).Times(4);
- syncable::ModelTypeSet to_migrate, difference;
- to_migrate.Put(syncable::PREFERENCES);
- difference.Put(syncable::AUTOFILL);
- difference.Put(syncable::BOOKMARKS);
+ syncer::ModelTypeSet to_migrate, difference;
+ to_migrate.Put(syncer::PREFERENCES);
+ difference.Put(syncer::AUTOFILL);
+ difference.Put(syncer::BOOKMARKS);
EXPECT_CALL(*manager(), state())
.WillOnce(Return(DataTypeManager::CONFIGURED));
@@ -140,7 +140,7 @@ TEST_F(SyncBackendMigratorTest, Sanity) {
SendConfigureDone(DataTypeManager::OK, difference);
EXPECT_EQ(BackendMigrator::REENABLING_TYPES, migrator()->state());
- SetUnsyncedTypes(syncable::ModelTypeSet());
+ SetUnsyncedTypes(syncer::ModelTypeSet());
SendConfigureDone(DataTypeManager::OK, preferred_types());
EXPECT_EQ(BackendMigrator::IDLE, migrator()->state());
@@ -150,10 +150,10 @@ TEST_F(SyncBackendMigratorTest, Sanity) {
// Test that in the normal case with Nigori a migration transitions through
// each state and wind up back in IDLE.
TEST_F(SyncBackendMigratorTest, MigrateNigori) {
- syncable::ModelTypeSet to_migrate, difference;
- to_migrate.Put(syncable::NIGORI);
- difference.Put(syncable::AUTOFILL);
- difference.Put(syncable::BOOKMARKS);
+ syncer::ModelTypeSet to_migrate, difference;
+ to_migrate.Put(syncer::NIGORI);
+ difference.Put(syncer::AUTOFILL);
+ difference.Put(syncer::BOOKMARKS);
EXPECT_CALL(*manager(), state())
.WillOnce(Return(DataTypeManager::CONFIGURED));
@@ -168,7 +168,7 @@ TEST_F(SyncBackendMigratorTest, MigrateNigori) {
SendConfigureDone(DataTypeManager::OK, difference);
EXPECT_EQ(BackendMigrator::REENABLING_TYPES, migrator()->state());
- SetUnsyncedTypes(syncable::ModelTypeSet());
+ SetUnsyncedTypes(syncer::ModelTypeSet());
SendConfigureDone(DataTypeManager::OK, preferred_types());
EXPECT_EQ(BackendMigrator::IDLE, migrator()->state());
}
@@ -177,8 +177,8 @@ TEST_F(SyncBackendMigratorTest, MigrateNigori) {
// Test that the migrator waits for the data type manager to be idle before
// starting a migration.
TEST_F(SyncBackendMigratorTest, WaitToStart) {
- syncable::ModelTypeSet to_migrate;
- to_migrate.Put(syncable::PREFERENCES);
+ syncer::ModelTypeSet to_migrate;
+ to_migrate.Put(syncer::PREFERENCES);
EXPECT_CALL(*manager(), state())
.WillOnce(Return(DataTypeManager::CONFIGURING));
@@ -190,8 +190,8 @@ TEST_F(SyncBackendMigratorTest, WaitToStart) {
EXPECT_CALL(*manager(), state())
.WillOnce(Return(DataTypeManager::CONFIGURED));
EXPECT_CALL(*manager(), Configure(_, syncer::CONFIGURE_REASON_MIGRATION));
- SetUnsyncedTypes(syncable::ModelTypeSet());
- SendConfigureDone(DataTypeManager::OK, syncable::ModelTypeSet());
+ SetUnsyncedTypes(syncer::ModelTypeSet());
+ SendConfigureDone(DataTypeManager::OK, syncer::ModelTypeSet());
EXPECT_EQ(BackendMigrator::DISABLING_TYPES, migrator()->state());
}
@@ -199,12 +199,12 @@ TEST_F(SyncBackendMigratorTest, WaitToStart) {
// Test that the migrator can cope with a migration request while a migration
// is in progress.
TEST_F(SyncBackendMigratorTest, RestartMigration) {
- syncable::ModelTypeSet to_migrate1, to_migrate2, to_migrate_union, bookmarks;
- to_migrate1.Put(syncable::PREFERENCES);
- to_migrate2.Put(syncable::AUTOFILL);
- to_migrate_union.Put(syncable::PREFERENCES);
- to_migrate_union.Put(syncable::AUTOFILL);
- bookmarks.Put(syncable::BOOKMARKS);
+ syncer::ModelTypeSet to_migrate1, to_migrate2, to_migrate_union, bookmarks;
+ to_migrate1.Put(syncer::PREFERENCES);
+ to_migrate2.Put(syncer::AUTOFILL);
+ to_migrate_union.Put(syncer::PREFERENCES);
+ to_migrate_union.Put(syncer::AUTOFILL);
+ bookmarks.Put(syncer::BOOKMARKS);
EXPECT_CALL(*manager(), state())
.WillOnce(Return(DataTypeManager::CONFIGURED));
@@ -215,7 +215,7 @@ TEST_F(SyncBackendMigratorTest, RestartMigration) {
EXPECT_EQ(BackendMigrator::DISABLING_TYPES, migrator()->state());
migrator()->MigrateTypes(to_migrate2);
- const syncable::ModelTypeSet difference1 =
+ const syncer::ModelTypeSet difference1 =
Difference(preferred_types(), to_migrate1);
Mock::VerifyAndClearExpectations(manager());
@@ -233,11 +233,11 @@ TEST_F(SyncBackendMigratorTest, RestartMigration) {
// Test that an external invocation of Configure(...) during a migration results
// in a migration reattempt.
TEST_F(SyncBackendMigratorTest, InterruptedWhileDisablingTypes) {
- syncable::ModelTypeSet to_migrate;
- syncable::ModelTypeSet difference;
- to_migrate.Put(syncable::PREFERENCES);
- difference.Put(syncable::AUTOFILL);
- difference.Put(syncable::BOOKMARKS);
+ syncer::ModelTypeSet to_migrate;
+ syncer::ModelTypeSet difference;
+ to_migrate.Put(syncer::PREFERENCES);
+ difference.Put(syncer::AUTOFILL);
+ difference.Put(syncer::BOOKMARKS);
EXPECT_CALL(*manager(), state())
.WillOnce(Return(DataTypeManager::CONFIGURED));
@@ -249,7 +249,7 @@ TEST_F(SyncBackendMigratorTest, InterruptedWhileDisablingTypes) {
Mock::VerifyAndClearExpectations(manager());
EXPECT_CALL(*manager(), Configure(HasModelTypes(difference),
syncer::CONFIGURE_REASON_MIGRATION));
- SetUnsyncedTypes(syncable::ModelTypeSet());
+ SetUnsyncedTypes(syncer::ModelTypeSet());
SendConfigureDone(DataTypeManager::OK, preferred_types());
EXPECT_EQ(BackendMigrator::DISABLING_TYPES, migrator()->state());
@@ -259,10 +259,10 @@ TEST_F(SyncBackendMigratorTest, InterruptedWhileDisablingTypes) {
// migrator while it's waiting for disabled types to have been purged
// from the sync db.
TEST_F(SyncBackendMigratorTest, WaitingForPurge) {
- syncable::ModelTypeSet to_migrate, difference;
- to_migrate.Put(syncable::PREFERENCES);
- to_migrate.Put(syncable::AUTOFILL);
- difference.Put(syncable::BOOKMARKS);
+ syncer::ModelTypeSet to_migrate, difference;
+ to_migrate.Put(syncer::PREFERENCES);
+ to_migrate.Put(syncer::AUTOFILL);
+ difference.Put(syncer::BOOKMARKS);
EXPECT_CALL(*manager(), state())
.WillOnce(Return(DataTypeManager::CONFIGURED));
@@ -275,8 +275,8 @@ TEST_F(SyncBackendMigratorTest, WaitingForPurge) {
SendConfigureDone(DataTypeManager::OK, difference);
EXPECT_EQ(BackendMigrator::DISABLING_TYPES, migrator()->state());
- syncable::ModelTypeSet prefs;
- prefs.Put(syncable::PREFERENCES);
+ syncer::ModelTypeSet prefs;
+ prefs.Put(syncer::PREFERENCES);
SetUnsyncedTypes(prefs);
SendConfigureDone(DataTypeManager::OK, difference);
EXPECT_EQ(BackendMigrator::DISABLING_TYPES, migrator()->state());
@@ -287,8 +287,8 @@ TEST_F(SyncBackendMigratorTest, WaitingForPurge) {
}
TEST_F(SyncBackendMigratorTest, MigratedTypeDisabledByUserDuringMigration) {
- syncable::ModelTypeSet to_migrate;
- to_migrate.Put(syncable::PREFERENCES);
+ syncer::ModelTypeSet to_migrate;
+ to_migrate.Put(syncer::PREFERENCES);
EXPECT_CALL(*manager(), state())
.WillOnce(Return(DataTypeManager::CONFIGURED));
@@ -296,26 +296,26 @@ TEST_F(SyncBackendMigratorTest, MigratedTypeDisabledByUserDuringMigration) {
.Times(2);
migrator()->MigrateTypes(to_migrate);
- RemovePreferredType(syncable::PREFERENCES);
+ RemovePreferredType(syncer::PREFERENCES);
SetUnsyncedTypes(to_migrate);
SendConfigureDone(DataTypeManager::OK, preferred_types());
EXPECT_EQ(BackendMigrator::REENABLING_TYPES, migrator()->state());
- SetUnsyncedTypes(syncable::ModelTypeSet());
+ SetUnsyncedTypes(syncer::ModelTypeSet());
SendConfigureDone(DataTypeManager::OK, preferred_types());
EXPECT_EQ(BackendMigrator::IDLE, migrator()->state());
}
TEST_F(SyncBackendMigratorTest, ConfigureFailure) {
- syncable::ModelTypeSet to_migrate;
- to_migrate.Put(syncable::PREFERENCES);
+ syncer::ModelTypeSet to_migrate;
+ to_migrate.Put(syncer::PREFERENCES);
EXPECT_CALL(*manager(), state())
.WillOnce(Return(DataTypeManager::CONFIGURED));
EXPECT_CALL(*manager(), Configure(_, syncer::CONFIGURE_REASON_MIGRATION))
.Times(1);
migrator()->MigrateTypes(to_migrate);
- SetUnsyncedTypes(syncable::ModelTypeSet());
- SendConfigureDone(DataTypeManager::ABORTED, syncable::ModelTypeSet());
+ SetUnsyncedTypes(syncer::ModelTypeSet());
+ SendConfigureDone(DataTypeManager::ABORTED, syncer::ModelTypeSet());
EXPECT_EQ(BackendMigrator::IDLE, migrator()->state());
}
« no previous file with comments | « chrome/browser/sync/backend_migrator.cc ('k') | chrome/browser/sync/failed_datatypes_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698