Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3741)

Unified Diff: chrome/browser/metrics/display_utils_unittest.cc

Issue 8298007: Aura: unit_tests now run on Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix ui_test_utils_aura Bind Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/bookmarks/bookmark_utils_unittest.cc ('k') | chrome/browser/printing/print_job_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « chrome/browser/bookmarks/bookmark_utils_unittest.cc ('k') | chrome/browser/printing/print_job_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698