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

chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc

Index: chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
index 9bd19f389693d3b7236a61bf87f40300dccb7428..c414a2022e1d49656ab46484c5a722dad7e518dd 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
@@ -41,6 +41,34 @@ bool IsShowingWebContentsModalDialog(WebContents* tab) {
   return web_contents_modal_dialog_manager->IsDialogActive();
 }
 
+#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
 
 class PrintPreviewUIUnitTest : public PrintPreviewTest {
@@ -69,8 +97,13 @@ TEST_F(PrintPreviewUIUnitTest, PrintPreviewData) {
   ASSERT_TRUE(initiator);
   EXPECT_FALSE(IsShowingWebContentsModalDialog(initiator));
 
+#if defined(USE_AURA)
+  printing::PrintPreviewDialogController* controller =
+      new PrintPreviewDialogControllerTest(GetContext());
+#else
   printing::PrintPreviewDialogController* controller =
       printing::PrintPreviewDialogController::GetInstance();
+#endif
   ASSERT_TRUE(controller);
 
   printing::PrintViewManager* print_view_manager =
@@ -115,6 +148,8 @@ TEST_F(PrintPreviewUIUnitTest, PrintPreviewData) {
       printing::COMPLETE_PREVIEW_DOCUMENT_INDEX,
       &data);
   EXPECT_EQ(NULL, data.get());
+
+  initiator->Close();
 }
 
 // Set and get the individual draft pages.
@@ -122,8 +157,13 @@ TEST_F(PrintPreviewUIUnitTest, PrintPreviewDraftPages) {
   WebContents* initiator = browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(initiator);
 
+#if defined(USE_AURA)
+  printing::PrintPreviewDialogController* controller =
+      new PrintPreviewDialogControllerTest(GetContext());
+#else
   printing::PrintPreviewDialogController* controller =
       printing::PrintPreviewDialogController::GetInstance();
+#endif
   ASSERT_TRUE(controller);
 
   printing::PrintViewManager* print_view_manager =
@@ -175,6 +215,8 @@ TEST_F(PrintPreviewUIUnitTest, PrintPreviewDraftPages) {
   preview_ui->ClearAllPreviewData();
   preview_ui->GetPrintPreviewDataForIndex(printing::FIRST_PAGE_INDEX, &data);
   EXPECT_EQ(NULL, data.get());
+
+  initiator->Close();
 }
 
 // Test the browser-side print preview cancellation functionality.
@@ -182,8 +224,13 @@ TEST_F(PrintPreviewUIUnitTest, GetCurrentPrintPreviewStatus) {
   WebContents* initiator = browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(initiator);
 
+#if defined(USE_AURA)
+  printing::PrintPreviewDialogController* controller =
+      new PrintPreviewDialogControllerTest(GetContext());
+#else
   printing::PrintPreviewDialogController* controller =
       printing::PrintPreviewDialogController::GetInstance();
+#endif
   ASSERT_TRUE(controller);
 
   printing::PrintViewManager* print_view_manager =
@@ -232,4 +279,6 @@ TEST_F(PrintPreviewUIUnitTest, GetCurrentPrintPreviewStatus) {
   preview_ui->GetCurrentPrintPreviewStatus(preview_ui_addr, kSecondRequestId,
                                            &cancel);
   EXPECT_FALSE(cancel);
+
+  initiator->Close();
 }