Index: chrome/browser/metrics/display_utils_unittest.cc |
diff --git a/chrome/browser/metrics/display_utils_unittest.cc b/chrome/browser/metrics/display_utils_unittest.cc |
index 11ef45eb7d6232ccf0aafe69366cf167fb0ae76a..40ebc4c9c77a2499e722ec121af03e87c085b35f 100644 |
--- a/chrome/browser/metrics/display_utils_unittest.cc |
+++ b/chrome/browser/metrics/display_utils_unittest.cc |
@@ -7,7 +7,14 @@ |
#include "content/browser/browser_thread.h" |
#include "testing/gtest/include/gtest/gtest.h" |
-TEST(DisplayUtilsTest, GetPrimaryDisplayDimensions) { |
+// Crashes on Linux Aura, probably because we need to initialize a Screen |
+// object. See http://crbug.com/100341 |
+#if defined(USE_AURA) && !defined(OS_WIN) |
+#define MAYBE_GetPrimaryDisplayDimensions DISABLED_GetPrimaryDisplayDimensions |
+#else |
+#define MAYBE_GetPrimaryDisplayDimensions GetPrimaryDisplayDimensions |
+#endif |
+TEST(DisplayUtilsTest, MAYBE_GetPrimaryDisplayDimensions) { |
MessageLoop message_loop; |
BrowserThread ui_thread(BrowserThread::UI, &message_loop); |
int width = 0, height = 0; |