Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/password_manager/password_store_x.cc

 // Copyright (c) 2012 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 "chrome/browser/password_manager/password_store_x.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "chrome/browser/password_manager/password_store_change.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 
 using content::BrowserThread;
 using std::vector;
 using content::PasswordForm;
 
@@ skipping 238 matching lines @@
       DeleteAndRecreateDatabaseFile();
     }
   }
   ssize_t result = ok ? forms.size() : -1;
   STLDeleteElements(&forms);
   return result;
 }
 
 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) && defined(OS_POSIX)
 // static
-void PasswordStoreX::RegisterUserPrefs(PrefServiceSyncable* prefs) {
+void PasswordStoreX::RegisterUserPrefs(PrefRegistrySyncable* registry) {
   // Normally we should be on the UI thread here, but in tests we might not.
-  prefs->RegisterBooleanPref(prefs::kPasswordsUseLocalProfileId,
-                             false,  // default: passwords don't use local ids
-                             PrefServiceSyncable::UNSYNCABLE_PREF);
+  registry->RegisterBooleanPref(prefs::kPasswordsUseLocalProfileId,
+                                // default: passwords don't use local ids
+                                false,
+                                PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 // static
 bool PasswordStoreX::PasswordsUseLocalProfileId(PrefService* prefs) {
   // Normally we should be on the UI thread here, but in tests we might not.
   return prefs->GetBoolean(prefs::kPasswordsUseLocalProfileId);
 }
 
 namespace {
 // This function is a hack to do something not entirely thread safe: the pref
 // service comes from the UI thread, but it's not ref counted. We keep a pointer
 // to it on the DB thread, and need to invoke a method on the UI thread. This
 // function does that for us without requiring ref counting the pref service.
 // TODO(mdm): Fix this if it becomes a problem. Given that this function will
 // be called once ever per profile, it probably will not cause a problem...
 void UISetPasswordsUseLocalProfileId(PrefService* prefs) {
   prefs->SetBoolean(prefs::kPasswordsUseLocalProfileId, true);
 }
 }  // anonymous namespace
 
 // static
 void PasswordStoreX::SetPasswordsUseLocalProfileId(PrefService* prefs) {
   // This method should work on any thread, but we expect the DB thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           base::Bind(&UISetPasswordsUseLocalProfileId, prefs));
 }
 #endif  // !defined(OS_MACOSX) && !defined(OS_CHROMEOS) && defined(OS_POSIX)