Print Preview: Re-enable some tests on Aura.

chrome/browser/printing/print_preview_dialog_controller_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/printing/print_preview_dialog_controller.h"
 #include "chrome/browser/printing/print_preview_test.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/common/url_constants.h"
 
 using content::WebContents;
 
-// Test crashes on Aura due to initiator's native view having no parent.
-// http://crbug.com/104284
-#if defined(USE_AURA)
-#define MAYBE_GetOrCreatePreviewDialog DISABLED_GetOrCreatePreviewDialog
-#define MAYBE_MultiplePreviewDialogs DISABLED_MultiplePreviewDialogs
-#define MAYBE_ClearInitiatorDetails DISABLED_ClearInitiatorDetails
-#else
-#define MAYBE_GetOrCreatePreviewDialog GetOrCreatePreviewDialog
-#define MAYBE_MultiplePreviewDialogs MultiplePreviewDialogs
-#define MAYBE_ClearInitiatorDetails ClearInitiatorDetails
-#endif
-
 namespace printing {
 
 typedef PrintPreviewTest PrintPreviewDialogControllerUnitTest;
 
 // Create/Get a preview dialog for initiator.
-TEST_F(PrintPreviewDialogControllerUnitTest, MAYBE_GetOrCreatePreviewDialog) {
+TEST_F(PrintPreviewDialogControllerUnitTest, GetOrCreatePreviewDialog) {
   // Lets start with one window with one tab.
   EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
   EXPECT_EQ(0, browser()->tab_strip_model()->count());
   chrome::NewTab(browser());
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
 
   // Create a reference to initiator contents.
   WebContents* initiator = browser()->tab_strip_model()->GetActiveWebContents();
 
   PrintPreviewDialogController* dialog_controller =
@@ skipping 17 matching lines @@
   // Preview dialog already exists. Tab count remains the same.
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
 
   // 1:1 relationship between initiator and preview dialog.
   EXPECT_EQ(new_preview_dialog, preview_dialog);
 }
 
 // Tests multiple print preview dialogs exist in the same browser for different
 // initiators. If a preview dialog already exists for an initiator, that
 // initiator gets focused.
-TEST_F(PrintPreviewDialogControllerUnitTest, MAYBE_MultiplePreviewDialogs) {
+TEST_F(PrintPreviewDialogControllerUnitTest, MultiplePreviewDialogs) {
   // Lets start with one window and two tabs.
   EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
   TabStripModel* tab_strip_model = browser()->tab_strip_model();
   ASSERT_TRUE(tab_strip_model);
 
   EXPECT_EQ(0, tab_strip_model->count());
 
   // Create some new initiators.
   chrome::NewTab(browser());
   WebContents* web_contents_1 = tab_strip_model->GetActiveWebContents();
@@ skipping 43 matching lines @@
   EXPECT_EQ(tab_2_index, tab_strip_model->active_index());
 
   // When we get the preview dialog for |web_contents_1|,
   // |preview_dialog_1| is activated and focused.
   dialog_controller->GetOrCreatePreviewDialog(web_contents_1);
   EXPECT_EQ(tab_1_index, tab_strip_model->active_index());
 }
 
 // Check clearing the initiator details associated with a print preview dialog
 // allows the initiator to create another print preview dialog.
-TEST_F(PrintPreviewDialogControllerUnitTest, MAYBE_ClearInitiatorDetails) {
+TEST_F(PrintPreviewDialogControllerUnitTest, ClearInitiatorDetails) {
   // Lets start with one window with one tab.
   EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
   EXPECT_EQ(0, browser()->tab_strip_model()->count());
   chrome::NewTab(browser());
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
 
   // Create a reference to initiator contents.
   WebContents* initiator = browser()->tab_strip_model()->GetActiveWebContents();
 
   PrintPreviewDialogController* dialog_controller =
@@ skipping 18 matching lines @@
       dialog_controller->GetOrCreatePreviewDialog(initiator);
 
   // New print preview dialog is a constrained window, so the number of tabs is
   // still 1.
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
   // Verify a new print preview dialog has been created.
   EXPECT_NE(new_preview_dialog, preview_dialog);
 }
 
 }  // namespace printing