Second batch of fixing prefs registrations.

chrome/browser/ui/gtk/browser_window_gtk.cc

Index: chrome/browser/ui/gtk/browser_window_gtk.cc
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index 87593818f23a967f08e9e1c162b7219a50165e7b..638e3e5bb331044f6c5dad887e7824f58267317d 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -1486,16 +1486,13 @@ GtkWidget* BrowserWindowGtk::titlebar_widget() const {
 }
 
 // static
-void BrowserWindowGtk::RegisterUserPrefs(PrefService* prefs,
-                                         PrefRegistrySyncable* registry) {
-  // TODO(joi): Remove PrefService parameter.
+void BrowserWindowGtk::RegisterUserPrefs(PrefRegistrySyncable* registry) {
   bool custom_frame_default = false;
   // Avoid checking the window manager if we're not connected to an X server (as
   // is the case in Valgrind tests).
-  if (ui::XDisplayExists() &&
-      !prefs->HasPrefPath(prefs::kUseCustomChromeFrame)) {
+  if (ui::XDisplayExists())
     custom_frame_default = GetCustomFramePrefDefault();
-  }
+
   registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame,
                                 custom_frame_default,
                                 PrefRegistrySyncable::UNSYNCABLE_PREF);