Created min size for print preview dialog and modified to allow the

chrome/browser/printing/print_preview_dialog_controller_unittest.cc

Index: chrome/browser/printing/print_preview_dialog_controller_unittest.cc
diff --git a/chrome/browser/printing/print_preview_dialog_controller_unittest.cc b/chrome/browser/printing/print_preview_dialog_controller_unittest.cc
index 4bb9631f34eaa8a4d10115e3b5d294f3e03529ac..0eeaeacfbc33815af63bc4e13ebf3fe548dc27d5 100644
--- a/chrome/browser/printing/print_preview_dialog_controller_unittest.cc
+++ b/chrome/browser/printing/print_preview_dialog_controller_unittest.cc
@@ -21,6 +21,8 @@
 #include "content/public/common/url_constants.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/web_contents_tester.h"
+#include "ui/views/widget/widget.h"
+#include "ui/views/window/dialog_delegate.h"
 
 using content::WebContents;
 using content::WebContentsObserver;
@@ -48,6 +50,34 @@ class PrintPreviewDialogDestroyedObserver : public WebContentsObserver {
   DISALLOW_COPY_AND_ASSIGN(PrintPreviewDialogDestroyedObserver);
 };
 
+#if defined(USE_AURA)
+class PrintPreviewDialogControllerTest:
+  public printing::PrintPreviewDialogController {
+
+ public:
+  explicit PrintPreviewDialogControllerTest(gfx::NativeView context):
+    context_(context) {}
+
+ // Need to override the function to get the delegate so that it uses the
+  // correct window.
+  ConstrainedWebDialogDelegate* GetWebDialogDelegate(
+      WebContents* initiator) override {
+    ConstrainedWebDialogDelegate* dialog =
+      ShowTopLevelConstrainedWebDialogInWindow(
+           initiator->GetBrowserContext(),
+           printing::GetPrintPreviewDialogDelegate(initiator),
+           initiator, context_);
+    return dialog;
+  }
+
+ protected:
+  ~PrintPreviewDialogControllerTest() override {}
+
+ private:
+  gfx::NativeWindow context_;
+
+};
+#endif
 }  // namespace
 
 namespace printing {
@@ -64,9 +94,13 @@ TEST_F(PrintPreviewDialogControllerUnitTest, GetOrCreatePreviewDialog) {
 
   // Create a reference to initiator contents.
   WebContents* initiator = browser()->tab_strip_model()->GetActiveWebContents();
-
+#if defined(USE_AURA)
+  PrintPreviewDialogController* dialog_controller =
+      new PrintPreviewDialogControllerTest(GetContext());
+#else
   PrintPreviewDialogController* dialog_controller =
       PrintPreviewDialogController::GetInstance();
+#endif
   ASSERT_TRUE(dialog_controller);
 
   // Get the preview dialog for initiator.
@@ -88,6 +122,8 @@ TEST_F(PrintPreviewDialogControllerUnitTest, GetOrCreatePreviewDialog) {
 
   // 1:1 relationship between initiator and preview dialog.
   EXPECT_EQ(new_preview_dialog, preview_dialog);
+  preview_dialog->Close();
+  initiator->Close();
 }
 
 // Tests multiple print preview dialogs exist in the same browser for different
@@ -111,8 +147,13 @@ TEST_F(PrintPreviewDialogControllerUnitTest, MultiplePreviewDialogs) {
   ASSERT_TRUE(web_contents_2);
   EXPECT_EQ(2, tab_strip_model->count());
 
+#if defined(USE_AURA)
+  PrintPreviewDialogController* dialog_controller =
+      new PrintPreviewDialogControllerTest(GetContext());
+#else
   PrintPreviewDialogController* dialog_controller =
       PrintPreviewDialogController::GetInstance();
+#endif
   ASSERT_TRUE(dialog_controller);
 
   // Create preview dialog for |web_contents_1|
@@ -153,6 +194,11 @@ TEST_F(PrintPreviewDialogControllerUnitTest, MultiplePreviewDialogs) {
   // |preview_dialog_1| is activated and focused.
   dialog_controller->GetOrCreatePreviewDialog(web_contents_1);
   EXPECT_EQ(tab_1_index, tab_strip_model->active_index());
+
+  preview_dialog_1->Close();
+  web_contents_1->Close();
+  preview_dialog_2->Close();
+  web_contents_2->Close();
 }
 
 // Check clearing the initiator details associated with a print preview dialog
@@ -167,8 +213,13 @@ TEST_F(PrintPreviewDialogControllerUnitTest, ClearInitiatorDetails) {
   // Create a reference to initiator contents.
   WebContents* initiator = browser()->tab_strip_model()->GetActiveWebContents();
 
+#if defined(USE_AURA)
+  PrintPreviewDialogController* dialog_controller =
+      new PrintPreviewDialogControllerTest(GetContext());
+#else
   PrintPreviewDialogController* dialog_controller =
       PrintPreviewDialogController::GetInstance();
+#endif
   ASSERT_TRUE(dialog_controller);
 
   // Get the preview dialog for the initiator.
@@ -193,6 +244,9 @@ TEST_F(PrintPreviewDialogControllerUnitTest, ClearInitiatorDetails) {
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
   // Verify a new print preview dialog has been created.
   EXPECT_NE(new_preview_dialog, preview_dialog);
+
+  initiator->Close();
+  new_preview_dialog->Close();
 }
 
 // Test that print preview dialogs close on navigation to new pages
@@ -222,8 +276,13 @@ TEST_F(PrintPreviewDialogControllerUnitTest, CloseDialogOnNavigation) {
   EXPECT_EQ(tiger, web_contents->GetLastCommittedURL());
 
   // Get the preview dialog
+#if defined(USE_AURA)
+  PrintPreviewDialogController* dialog_controller =
+      new PrintPreviewDialogControllerTest(GetContext());
+#else
   PrintPreviewDialogController* dialog_controller =
       PrintPreviewDialogController::GetInstance();
+#endif
   ASSERT_TRUE(dialog_controller);
   WebContents* tiger_preview_dialog =
       dialog_controller->GetOrCreatePreviewDialog(web_contents);
@@ -303,6 +362,8 @@ TEST_F(PrintPreviewDialogControllerUnitTest, CloseDialogOnNavigation) {
   ASSERT_TRUE(tiger_preview_dialog_2b);
   EXPECT_EQ(tiger_preview_dialog_2b, tiger_preview_dialog_2);
   EXPECT_NE(tiger_preview_dialog_2b, web_contents);
+  tiger_preview_dialog_2->Close();
+  web_contents->Close();
 }
 
 // Tests preview dialog controller cleans up correctly and does not throw errors
@@ -321,8 +382,13 @@ TEST_F(PrintPreviewDialogControllerUnitTest, MultiplePreviewDialogsClose) {
   WebContents* web_contents_1 = tab_strip_model->GetActiveWebContents();
   ASSERT_TRUE(web_contents_1);
   EXPECT_EQ(1, tab_strip_model->count());
+#if defined(USE_AURA)
+  PrintPreviewDialogController* dialog_controller =
+      new PrintPreviewDialogControllerTest(GetContext());
+#else
   PrintPreviewDialogController* dialog_controller =
       PrintPreviewDialogController::GetInstance();
+#endif
   ASSERT_TRUE(dialog_controller);
 
   // Create preview dialog for |web_contents_1|. Should not create a new tab.