| 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 12910fae0f96dcfd94b184420b2bb8e0d11b05d2..e98b4f29c9a4924bd014835dd4ea2afae8c415e4 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
|
| @@ -16,6 +16,7 @@
|
| #include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"
|
| #include "chrome/test/base/browser_with_test_window_test.h"
|
| +#include "chrome/test/base/testing_browser_process.h"
|
| #include "components/prefs/pref_service.h"
|
| #include "components/web_modal/web_contents_modal_dialog_manager.h"
|
| #include "content/public/browser/plugin_service.h"
|
| @@ -70,6 +71,10 @@ TEST_F(PrintPreviewUIUnitTest, PrintPreviewData) {
|
| ASSERT_TRUE(initiator);
|
| EXPECT_FALSE(IsShowingWebContentsModalDialog(initiator));
|
|
|
| +#if defined(USE_AURA)
|
| + TestingBrowserProcess::GetGlobal()->SetPrintPreviewDialogController(
|
| + new PrintPreviewDialogControllerTest(GetContext()));
|
| +#endif
|
| printing::PrintPreviewDialogController* controller =
|
| printing::PrintPreviewDialogController::GetInstance();
|
| ASSERT_TRUE(controller);
|
| @@ -116,6 +121,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.
|
| @@ -123,6 +130,10 @@ TEST_F(PrintPreviewUIUnitTest, PrintPreviewDraftPages) {
|
| WebContents* initiator = browser()->tab_strip_model()->GetActiveWebContents();
|
| ASSERT_TRUE(initiator);
|
|
|
| +#if defined(USE_AURA)
|
| + TestingBrowserProcess::GetGlobal()->SetPrintPreviewDialogController(
|
| + new PrintPreviewDialogControllerTest(GetContext()));
|
| +#endif
|
| printing::PrintPreviewDialogController* controller =
|
| printing::PrintPreviewDialogController::GetInstance();
|
| ASSERT_TRUE(controller);
|
| @@ -176,6 +187,9 @@ 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.
|
| @@ -183,6 +197,10 @@ TEST_F(PrintPreviewUIUnitTest, GetCurrentPrintPreviewStatus) {
|
| WebContents* initiator = browser()->tab_strip_model()->GetActiveWebContents();
|
| ASSERT_TRUE(initiator);
|
|
|
| +#if defined(USE_AURA)
|
| + TestingBrowserProcess::GetGlobal()->SetPrintPreviewDialogController(
|
| + new PrintPreviewDialogControllerTest(GetContext()));
|
| +#endif
|
| printing::PrintPreviewDialogController* controller =
|
| printing::PrintPreviewDialogController::GetInstance();
|
| ASSERT_TRUE(controller);
|
| @@ -233,4 +251,6 @@ TEST_F(PrintPreviewUIUnitTest, GetCurrentPrintPreviewStatus) {
|
| preview_ui->GetCurrentPrintPreviewStatus(preview_ui_addr, kSecondRequestId,
|
| &cancel);
|
| EXPECT_FALSE(cancel);
|
| +
|
| + initiator->Close();
|
| }
|
|
|