Index: chrome/browser/ui/webui/print_preview_ui_unittest.cc |
=================================================================== |
--- chrome/browser/ui/webui/print_preview_ui_unittest.cc (revision 111220) |
+++ chrome/browser/ui/webui/print_preview_ui_unittest.cc (working copy) |
@@ -30,12 +30,16 @@ |
typedef BrowserWithTestWindowTest PrintPreviewUIUnitTest; |
-// Test crashs on TouchUI due to initiator tab's native view having no parent. |
+// Test crashes on Aura due to initiator tab's native view having no parent. |
// http://crbug.com/104284 |
-#if defined(TOUCH_UI) |
+#if defined(USE_AURA) |
+#define MAYBE_PrintPreviewDraftPages DISABLED_PrintPreviewDraftPages |
#define MAYBE_PrintPreviewData DISABLED_PrintPreviewData |
+#define MAYBE_GetCurrentPrintPreviewStatus DISABLED_GetCurrentPrintPreviewStatus |
#else |
#define MAYBE_PrintPreviewData PrintPreviewData |
+#define MAYBE_PrintPreviewDraftPages PrintPreviewDraftPages |
+#define MAYBE_GetCurrentPrintPreviewStatus GetCurrentPrintPreviewStatus |
#endif |
// Create/Get a preview tab for initiator tab. |
TEST_F(PrintPreviewUIUnitTest, MAYBE_PrintPreviewData) { |
@@ -97,12 +101,6 @@ |
EXPECT_EQ(NULL, data.get()); |
} |
-// http://crbug.com/104284 |
-#if defined(TOUCH_UI) |
-#define MAYBE_PrintPreviewDraftPages DISABLED_PrintPreviewDraftPages |
-#else |
-#define MAYBE_PrintPreviewDraftPages PrintPreviewDraftPages |
-#endif |
// Set and get the individual draft pages. |
TEST_F(PrintPreviewUIUnitTest, MAYBE_PrintPreviewDraftPages) { |
#if !defined(GOOGLE_CHROME_BUILD) || defined(OS_CHROMEOS) |
@@ -171,12 +169,6 @@ |
EXPECT_EQ(NULL, data.get()); |
} |
-// http://crbug.com/104284 |
-#if defined(TOUCH_UI) |
-#define MAYBE_GetCurrentPrintPreviewStatus DISABLED_GetCurrentPrintPreviewStatus |
-#else |
-#define MAYBE_GetCurrentPrintPreviewStatus GetCurrentPrintPreviewStatus |
-#endif |
// Test the browser-side print preview cancellation functionality. |
TEST_F(PrintPreviewUIUnitTest, MAYBE_GetCurrentPrintPreviewStatus) { |
#if !defined(GOOGLE_CHROME_BUILD) || defined(OS_CHROMEOS) |