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

Unified Diff: chrome/browser/ui/webui/print_preview_ui_unittest.cc

Issue 8658002: Print preview: Enable tests that were previous excluded on CrOS. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month 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/ui/webui/print_preview_handler_unittest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/print_preview_ui_unittest.cc
===================================================================
--- chrome/browser/ui/webui/print_preview_ui_unittest.cc (revision 111212)
+++ chrome/browser/ui/webui/print_preview_ui_unittest.cc (working copy)
@@ -32,7 +32,9 @@
// Test crashs on TouchUI due to initiator tab's native view having no parent.
// http://crbug.com/104284
-#if defined(TOUCH_UI)
+// Crashes on Aura due to no FocusManager.
+// http://crbug.com/105186
+#if defined(TOUCH_UI) || defined(USE_AURA)
#define MAYBE_PrintPreviewData DISABLED_PrintPreviewData
#else
#define MAYBE_PrintPreviewData PrintPreviewData
@@ -98,7 +100,8 @@
}
// http://crbug.com/104284
-#if defined(TOUCH_UI)
+// http://crbug.com/105186
+#if defined(TOUCH_UI) || defined(USE_AURA)
#define MAYBE_PrintPreviewDraftPages DISABLED_PrintPreviewDraftPages
#else
#define MAYBE_PrintPreviewDraftPages PrintPreviewDraftPages
@@ -172,7 +175,8 @@
}
// http://crbug.com/104284
-#if defined(TOUCH_UI)
+// http://crbug.com/105186
+#if defined(TOUCH_UI) || defined(USE_AURA)
#define MAYBE_GetCurrentPrintPreviewStatus DISABLED_GetCurrentPrintPreviewStatus
#else
#define MAYBE_GetCurrentPrintPreviewStatus GetCurrentPrintPreviewStatus
« no previous file with comments | « chrome/browser/ui/webui/print_preview_handler_unittest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698