summaryrefslogtreecommitdiffstats
path: root/sync/internal_api/sync_backup_manager_unittest.cc
diff options
context:
space:
mode:
authorhaitaol@chromium.org <haitaol@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-26 20:35:35 +0000
committerhaitaol@chromium.org <haitaol@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-26 20:35:35 +0000
commit839ef2d812c2596732bbf8ec90b767a7176c960e (patch)
tree23d8e3953ddcd8320dd5f9974763a00a980603c3 /sync/internal_api/sync_backup_manager_unittest.cc
parent5d3dcf83e06a7fdd9417add32a01b20540fe0cea (diff)
downloadchromium_src-839ef2d812c2596732bbf8ec90b767a7176c960e.zip
chromium_src-839ef2d812c2596732bbf8ec90b767a7176c960e.tar.gz
chromium_src-839ef2d812c2596732bbf8ec90b767a7176c960e.tar.bz2
Special handling of preference backup to not change local values in backup mode.
This is to avoid restoring hijacked preferences due to backup in case they get into backup DB. BUG=387997 Review URL: https://codereview.chromium.org/354453003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280093 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api/sync_backup_manager_unittest.cc')
-rw-r--r--sync/internal_api/sync_backup_manager_unittest.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/sync/internal_api/sync_backup_manager_unittest.cc b/sync/internal_api/sync_backup_manager_unittest.cc
index 5472c02..a130a63 100644
--- a/sync/internal_api/sync_backup_manager_unittest.cc
+++ b/sync/internal_api/sync_backup_manager_unittest.cc
@@ -41,7 +41,7 @@ class SyncBackupManagerTest : public testing::Test {
NULL, NULL);
manager->ConfigureSyncer(
CONFIGURE_REASON_NEW_CLIENT,
- ModelTypeSet(PREFERENCES),
+ ModelTypeSet(SEARCH_ENGINES),
ModelTypeSet(), ModelTypeSet(), ModelTypeSet(),
ModelSafeRoutingInfo(),
base::Bind(&OnConfigDone, true),
@@ -67,14 +67,14 @@ TEST_F(SyncBackupManagerTest, NormalizeAndPersist) {
scoped_ptr<SyncBackupManager> manager(new SyncBackupManager);
InitManager(manager.get());
- CreateEntry(manager->GetUserShare(), PREFERENCES, "test");
+ CreateEntry(manager->GetUserShare(), SEARCH_ENGINES, "test");
{
// New entry is local and unsynced at first.
ReadTransaction trans(FROM_HERE, manager->GetUserShare());
ReadNode pref(&trans);
EXPECT_EQ(BaseNode::INIT_OK,
- pref.InitByClientTagLookup(PREFERENCES, "test"));
+ pref.InitByClientTagLookup(SEARCH_ENGINES, "test"));
EXPECT_FALSE(pref.GetEntry()->GetId().ServerKnows());
EXPECT_TRUE(pref.GetEntry()->GetIsUnsynced());
}
@@ -86,7 +86,7 @@ TEST_F(SyncBackupManagerTest, NormalizeAndPersist) {
ReadTransaction trans(FROM_HERE, manager->GetUserShare());
ReadNode pref(&trans);
EXPECT_EQ(BaseNode::INIT_OK,
- pref.InitByClientTagLookup(PREFERENCES, "test"));
+ pref.InitByClientTagLookup(SEARCH_ENGINES, "test"));
EXPECT_TRUE(pref.GetEntry()->GetId().ServerKnows());
EXPECT_FALSE(pref.GetEntry()->GetIsUnsynced());
}
@@ -99,7 +99,7 @@ TEST_F(SyncBackupManagerTest, NormalizeAndPersist) {
ReadTransaction trans(FROM_HERE, manager->GetUserShare());
ReadNode pref(&trans);
EXPECT_EQ(BaseNode::INIT_OK,
- pref.InitByClientTagLookup(PREFERENCES, "test"));
+ pref.InitByClientTagLookup(SEARCH_ENGINES, "test"));
EXPECT_TRUE(pref.GetEntry()->GetId().ServerKnows());
EXPECT_FALSE(pref.GetEntry()->GetIsUnsynced());
}