Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/pepper_flash_settings_manager.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/pepper_flash_settings_manager.h"
 
 #include <map>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/pepper_flash_settings_helper.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/common/content_constants.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_channel.h"
@@ skipping 894 matching lines @@
     if (webkit::IsPepperPlugin(*iter) && plugin_prefs->IsPluginEnabled(*iter)) {
       if (plugin_info)
         *plugin_info = *iter;
       return true;
     }
   }
   return false;
 }
 
 // static
-void PepperFlashSettingsManager::RegisterUserPrefs(PrefServiceSyncable* prefs) {
-  prefs->RegisterBooleanPref(prefs::kDeauthorizeContentLicenses,
-                             false,
-                             PrefServiceSyncable::UNSYNCABLE_PREF);
+void PepperFlashSettingsManager::RegisterUserPrefs(
+    PrefRegistrySyncable* registry) {
+  registry->RegisterBooleanPref(prefs::kDeauthorizeContentLicenses,
+                                false,
+                                PrefRegistrySyncable::UNSYNCABLE_PREF);
 
-  prefs->RegisterBooleanPref(prefs::kPepperFlashSettingsEnabled,
-                             true,
-                             PrefServiceSyncable::UNSYNCABLE_PREF);
+  registry->RegisterBooleanPref(prefs::kPepperFlashSettingsEnabled,
+                                true,
+                                PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 uint32 PepperFlashSettingsManager::DeauthorizeContentLicenses() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   EnsureCoreExists();
   uint32 id = GetNextRequestId();
   core_->DeauthorizeContentLicenses(id);
   return id;
 }
@@ skipping 64 matching lines @@
 }
 
 void PepperFlashSettingsManager::OnError(Core* core) {
   DCHECK(core);
   if (core != core_.get())
     return;
 
   core_->Detach();
   core_ = NULL;
 }