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

Unified Diff: chrome/browser/shell_integration_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
Index: chrome/browser/shell_integration_unittest.cc
diff --git a/chrome/browser/shell_integration_unittest.cc b/chrome/browser/shell_integration_unittest.cc
index f5c41cbe50911599b1f669688b395654af937d76..02fd70ed3a70c454a2fdd055c41ce1f079b2ba3f 100644
--- a/chrome/browser/shell_integration_unittest.cc
+++ b/chrome/browser/shell_integration_unittest.cc
@@ -159,7 +159,13 @@ TEST(ShellIntegrationTest, GetDesktopShortcutFilename) {
}
}
-TEST(ShellIntegrationTest, GetDesktopFileContents) {
+// Fails on Linux Aura, see http://crbug.com/100346
+#if defined(USE_AURA) && !defined(OS_WIN)
+#define MAYBE_GetDesktopFileContents FAILS_GetDesktopFileContents
+#else
+#define MAYBE_GetDesktopFileContents GetDesktopFileContents
+#endif
+TEST(ShellIntegrationTest, MAYBE_GetDesktopFileContents) {
const struct {
const char* url;
const char* title;
« no previous file with comments | « chrome/browser/printing/print_job_unittest.cc ('k') | chrome/browser/ui/views/accessibility_event_router_views_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698