Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/prefs/incognito_mode_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/prefs/incognito_mode_prefs.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 #endif  // OS_WIN
 
 // static
 bool IncognitoModePrefs::IntToAvailability(int in_value,
@@ skipping 26 matching lines @@
   return result;
 }
 
 // static
 void IncognitoModePrefs::SetAvailability(PrefService* prefs,
                                          const Availability availability) {
   prefs->SetInteger(prefs::kIncognitoModeAvailability, availability);
 }
 
 // static
-void IncognitoModePrefs::RegisterUserPrefs(PrefServiceSyncable* pref_service) {
-  DCHECK(pref_service);
-  pref_service->RegisterIntegerPref(prefs::kIncognitoModeAvailability,
-                                    IncognitoModePrefs::ENABLED,
-                                    PrefServiceSyncable::UNSYNCABLE_PREF);
+void IncognitoModePrefs::RegisterUserPrefs(PrefRegistrySyncable* registry) {
+  DCHECK(registry);

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

nit: not needed, we crash below if the pointer is NULL.

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

Done.

+  registry->RegisterIntegerPref(prefs::kIncognitoModeAvailability,
+                                IncognitoModePrefs::ENABLED,
+                                PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 // static
 bool IncognitoModePrefs::ShouldLaunchIncognito(
     const CommandLine& command_line,
     const PrefService* prefs) {
   Availability incognito_avail = GetAvailability(prefs);
   return incognito_avail != IncognitoModePrefs::DISABLED &&
          (command_line.HasSwitch(switches::kIncognito) ||
           incognito_avail == IncognitoModePrefs::FORCED);
 }