Refactor preference syncing.

chrome/browser/password_manager/password_store_x_unittest.cc

 // Copyright (c) 2011 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 "base/basictypes.h"
 #include "base/memory/scoped_temp_dir.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/time.h"
@@ skipping 457 matching lines @@
 
   // The WDS schedules tasks to run on the DB thread so we schedule yet another
   // task to notify us that it's safe to carry on with the test.
   WaitableEvent done(false, false);
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
       new SignalingTask(&done));
   done.Wait();
 
   // Prentend that the migration has already taken place.
   profile_->GetPrefs()->RegisterBooleanPref(prefs::kLoginDatabaseMigrated,
-                                            true);
+                                            true,
+                                            PrefService::UNSYNCABLE_PREF);
 
   // Initializing the PasswordStore shouldn't trigger a migration.
   scoped_refptr<PasswordStoreX> store(
       new PasswordStoreX(login_db_.release(),
                            profile_.get(),
                            wds_.get(),
                            GetBackend()));
   store->Init();
 
   MockPasswordStoreConsumer consumer;
@@ skipping 12 matching lines @@
   MessageLoop::current()->Run();
 
   STLDeleteElements(&unexpected_autofillable);
 
   store->Shutdown();
 }
 
 TEST_P(PasswordStoreXTest, Notifications) {
   // Pretend that the migration has already taken place.
   profile_->GetPrefs()->RegisterBooleanPref(prefs::kLoginDatabaseMigrated,
-                                            true);
+                                            true,
+                                            PrefService::UNSYNCABLE_PREF);
 
   // Initializing the PasswordStore shouldn't trigger a migration.
   scoped_refptr<PasswordStoreX> store(
       new PasswordStoreX(login_db_.release(),
                            profile_.get(),
                            wds_.get(),
                            GetBackend()));
   store->Init();
 
   PasswordFormData form_data =
@@ skipping 117 matching lines @@
       new SignalingTask(&done));
   done.Wait();
 
   // Get the new size of the login DB file. We expect it to be larger.
   base::PlatformFileInfo db_file_full_info;
   ASSERT_TRUE(file_util::GetFileInfo(login_db_file, &db_file_full_info));
   EXPECT_GT(db_file_full_info.size, db_file_start_info.size);
 
   // Pretend that the WDS migration has already taken place.
   profile_->GetPrefs()->RegisterBooleanPref(prefs::kLoginDatabaseMigrated,
-                                            true);
+                                            true,
+                                            PrefService::UNSYNCABLE_PREF);
 
   // Initializing the PasswordStore shouldn't trigger a native migration (yet).
   scoped_refptr<PasswordStoreX> store(
       new PasswordStoreX(login_db_.release(),
                            profile_.get(),
                            wds_.get(),
                            GetBackend()));
   store->Init();
 
   MockPasswordStoreConsumer consumer;
@@ skipping 82 matching lines @@
 
 INSTANTIATE_TEST_CASE_P(NoBackend,
                         PasswordStoreXTest,
                         testing::Values(NO_BACKEND));
 INSTANTIATE_TEST_CASE_P(FailingBackend,
                         PasswordStoreXTest,
                         testing::Values(FAILING_BACKEND));
 INSTANTIATE_TEST_CASE_P(WorkingBackend,
                         PasswordStoreXTest,
                         testing::Values(WORKING_BACKEND));