1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index e4f7155..ccfc556 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -1194,8 +1194,12 @@ GtkWindow* BrowserWindowGtk::GetBrowserWindowForXID(XID xid) {
 // static
 void BrowserWindowGtk::RegisterUserPrefs(PrefService* prefs) {
   bool custom_frame_default = false;
-  if (!prefs->HasPrefPath(prefs::kUseCustomChromeFrame))
+  // Avoid checking the window manager if we're not connected to an X server (as
+  // is the case in Valgrind tests).
+  if (x11_util::XDisplayExists() &&
+      !prefs->HasPrefPath(prefs::kUseCustomChromeFrame)) {
     custom_frame_default = GetCustomFramePrefDefault();
+  }
   prefs->RegisterBooleanPref(
       prefs::kUseCustomChromeFrame, custom_frame_default);
 }