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 50f85487e9f3c9f8988c5efa2655ad0e780f9212..2644f9851e1fc3ac6018e75507085451dbd670c3 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -1486,14 +1486,11 @@ 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()) {

[Mattias Nissler (ping if slow), 2013/02/15 12:23:15]

nit: no need for curlies any longer.

[Jói, 2013/02/18 16:05:42]

Done.

     custom_frame_default = GetCustomFramePrefDefault();
   }
   registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame,