Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/bookmarks/bookmark_prompt_prefs.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/bookmarks/bookmark_prompt_prefs.h"
 
-#include "chrome/browser/prefs/pref_service_syncable.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
+#include "chrome/browser/prefs/pref_service.h"

[Mattias Nissler (ping if slow), 2013/02/06 17:53:33]

Should be pref_service_base.h instead? But the plan for that was to go away in
favor of a single PrefService type, correct? In that case, no change needed.

[Jói, 2013/02/07 14:52:32]

That's right, the plan is for PrefServiceBase to go away so I'm preferring to
include the concrete type.

 #include "chrome/common/pref_names.h"
 
 BookmarkPromptPrefs::BookmarkPromptPrefs(PrefServiceBase* user_prefs)
     : prefs_(user_prefs) {
 }
 
 BookmarkPromptPrefs::~BookmarkPromptPrefs() {
 }
 
 void BookmarkPromptPrefs::DisableBookmarkPrompt() {
   prefs_->SetBoolean(prefs::kBookmarkPromptEnabled, false);
 }
 
 int BookmarkPromptPrefs::GetPromptImpressionCount() const {
   return prefs_->GetInteger(prefs::kBookmarkPromptImpressionCount);
 }
 
 void BookmarkPromptPrefs::IncrementPromptImpressionCount() {
   prefs_->SetInteger(prefs::kBookmarkPromptImpressionCount,
                      GetPromptImpressionCount() + 1);
 }
 
 bool BookmarkPromptPrefs::IsBookmarkPromptEnabled() const {
   return prefs_->GetBoolean(prefs::kBookmarkPromptEnabled);
 }
 
 // static
-void BookmarkPromptPrefs::RegisterUserPrefs(PrefServiceSyncable* user_prefs) {
+void BookmarkPromptPrefs::RegisterUserPrefs(PrefRegistrySyncable* registry) {
   // We always register preferences without checking FieldTrial, because
   // we may not receive field trial list from the server yet.
-  user_prefs->RegisterBooleanPref(prefs::kBookmarkPromptEnabled, true,
-                                  PrefServiceSyncable::UNSYNCABLE_PREF);
-  user_prefs->RegisterIntegerPref(prefs::kBookmarkPromptImpressionCount, 0,
-                                  PrefServiceSyncable::UNSYNCABLE_PREF);
+  registry->RegisterBooleanPref(prefs::kBookmarkPromptEnabled, true,
+                                PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterIntegerPref(prefs::kBookmarkPromptImpressionCount, 0,
+                                PrefRegistrySyncable::UNSYNCABLE_PREF);
 }