--- chrome/browser/chrome_thread.h
+++ chrome/browser/chrome_thread.h
@@ -51,7 +51,7 @@ class ChromeThread : public base::Thread {
     // This is the thread that processes IPC and network messages.
     IO,
 
-#if defined(OS_LINUX)
+#if defined(USE_X11)
     // This thread has a second connection to the X server and is used to
     // process UI requests when routing the request to the UI thread would risk
     // deadlock.
diff --git chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc
index c1db965..78803b3 100644