Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/geolocation/chrome_geolocation_permission_context_factory.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/geolocation/chrome_geolocation_permission_context_factory.h"
 
+#include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/common/pref_names.h"
 #if defined(OS_ANDROID)
 #include "chrome/browser/geolocation/chrome_geolocation_permission_context_android.h"
 #else
 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h"
 #endif
 
 namespace {
 
@@ skipping 47 matching lines @@
 ~ChromeGeolocationPermissionContextFactory() {
 }
 
 ProfileKeyedService*
 ChromeGeolocationPermissionContextFactory::BuildServiceInstanceFor(
     Profile* profile) const {
   return new Service(profile);
 }
 
 void ChromeGeolocationPermissionContextFactory::RegisterUserPrefs(
-    PrefServiceSyncable* user_prefs) {
+    PrefRegistrySyncable* registry) {
 #if defined(OS_ANDROID)
-  user_prefs->RegisterBooleanPref(prefs::kGeolocationEnabled,
-                                  true,
-                                  PrefServiceSyncable::UNSYNCABLE_PREF);
+  registry->RegisterBooleanPref(prefs::kGeolocationEnabled,
+                                true,
+                                PrefRegistrySyncable::UNSYNCABLE_PREF);
 #endif
 }
 
 bool ChromeGeolocationPermissionContextFactory::
 ServiceRedirectedInIncognito() const {
   return true;
 }