| Index: chrome/browser/printing/print_preview_tab_controller_unittest.cc
|
| ===================================================================
|
| --- chrome/browser/printing/print_preview_tab_controller_unittest.cc (revision 111220)
|
| +++ chrome/browser/printing/print_preview_tab_controller_unittest.cc (working copy)
|
| @@ -16,15 +16,20 @@
|
| #include "content/public/browser/notification_types.h"
|
| #include "content/public/common/url_constants.h"
|
|
|
| -typedef BrowserWithTestWindowTest PrintPreviewTabControllerUnitTest;
|
| -
|
| -// 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_GetOrCreatePreviewTab DISABLED_GetOrCreatePreviewTab
|
| +#define MAYBE_MultiplePreviewTabs DISABLED_MultiplePreviewTabs
|
| +#define MAYBE_ClearInitiatorTabDetails DISABLED_ClearInitiatorTabDetails
|
| #else
|
| #define MAYBE_GetOrCreatePreviewTab GetOrCreatePreviewTab
|
| +#define MAYBE_MultiplePreviewTabs MultiplePreviewTabs
|
| +#define MAYBE_ClearInitiatorTabDetails ClearInitiatorTabDetails
|
| #endif
|
| +
|
| +typedef BrowserWithTestWindowTest PrintPreviewTabControllerUnitTest;
|
| +
|
| // Create/Get a preview tab for initiator tab.
|
| TEST_F(PrintPreviewTabControllerUnitTest, MAYBE_GetOrCreatePreviewTab) {
|
| ASSERT_TRUE(browser());
|
| @@ -64,12 +69,6 @@
|
| EXPECT_EQ(new_preview_tab, preview_tab);
|
| }
|
|
|
| -// http://crbug.com/104284
|
| -#if defined(TOUCH_UI)
|
| -#define MAYBE_MultiplePreviewTabs DISABLED_MultiplePreviewTabs
|
| -#else
|
| -#define MAYBE_MultiplePreviewTabs MultiplePreviewTabs
|
| -#endif
|
| // To show multiple print preview tabs exist in the same browser for
|
| // different initiator tabs. If preview tab already exists for an initiator, it
|
| // gets focused.
|
| @@ -131,12 +130,6 @@
|
| EXPECT_EQ(tab_1_index, browser()->active_index());
|
| }
|
|
|
| -// http://crbug.com/104284
|
| -#if defined(TOUCH_UI)
|
| -#define MAYBE_ClearInitiatorTabDetails DISABLED_ClearInitiatorTabDetails
|
| -#else
|
| -#define MAYBE_ClearInitiatorTabDetails ClearInitiatorTabDetails
|
| -#endif
|
| // Clear the initiator tab details associated with preview tab.
|
| TEST_F(PrintPreviewTabControllerUnitTest, MAYBE_ClearInitiatorTabDetails) {
|
| ASSERT_TRUE(browser());
|
|
|