--- base/test/test_suite.h
+++ base/test/test_suite.h
@@ -20,7 +20,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/multiprocess_func_list.h"
 
-#if defined(OS_LINUX)
+#if defined(USE_X11)
 #include <gtk/gtk.h>
 #endif
 
@@ -33,7 +33,7 @@ class TestSuite {
     base::EnableTerminationOnHeapCorruption();
     CommandLine::Init(argc, argv);
     testing::InitGoogleTest(&argc, argv);
-#if defined(OS_LINUX)
+#if defined(USE_X11)
     g_thread_init(NULL);
     gtk_init_check(&argc, &argv);
 #endif
diff --git base/third_party/nspr/prtime.cc base/third_party/nspr/prtime.cc
index 2407884..cef9446 100644