| 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 6fee86b3744e9333f8a08a30fefbe6aadd4e77a8..55895cd73d0f2207acc2c707185f47054b97d398 100644
|
| --- a/chrome/browser/printing/print_preview_dialog_controller_unittest.cc
|
| +++ b/chrome/browser/printing/print_preview_dialog_controller_unittest.cc
|
| @@ -13,6 +13,7 @@
|
| #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 "chrome/test/base/testing_browser_process.h"
|
| #include "content/public/browser/navigation_controller.h"
|
| #include "content/public/browser/navigation_details.h"
|
| #include "content/public/browser/navigation_entry.h"
|
| @@ -21,6 +22,7 @@
|
| #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/window/dialog_delegate.h"
|
|
|
| using content::WebContents;
|
| using content::WebContentsObserver;
|
| @@ -64,7 +66,10 @@ TEST_F(PrintPreviewDialogControllerUnitTest, GetOrCreatePreviewDialog) {
|
|
|
| // Create a reference to initiator contents.
|
| WebContents* initiator = browser()->tab_strip_model()->GetActiveWebContents();
|
| -
|
| +#if defined(USE_AURA)
|
| + TestingBrowserProcess::GetGlobal()->SetPrintPreviewDialogController(
|
| + new PrintPreviewDialogControllerTest(GetContext()));
|
| +#endif
|
| PrintPreviewDialogController* dialog_controller =
|
| PrintPreviewDialogController::GetInstance();
|
| ASSERT_TRUE(dialog_controller);
|
| @@ -89,6 +94,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
|
| @@ -112,6 +119,10 @@ TEST_F(PrintPreviewDialogControllerUnitTest, MultiplePreviewDialogs) {
|
| ASSERT_TRUE(web_contents_2);
|
| EXPECT_EQ(2, tab_strip_model->count());
|
|
|
| +#if defined(USE_AURA)
|
| + TestingBrowserProcess::GetGlobal()->SetPrintPreviewDialogController(
|
| + new PrintPreviewDialogControllerTest(GetContext()));
|
| +#endif
|
| PrintPreviewDialogController* dialog_controller =
|
| PrintPreviewDialogController::GetInstance();
|
| ASSERT_TRUE(dialog_controller);
|
| @@ -156,6 +167,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
|
| @@ -170,6 +186,10 @@ TEST_F(PrintPreviewDialogControllerUnitTest, ClearInitiatorDetails) {
|
| // Create a reference to initiator contents.
|
| WebContents* initiator = browser()->tab_strip_model()->GetActiveWebContents();
|
|
|
| +#if defined(USE_AURA)
|
| + TestingBrowserProcess::GetGlobal()->SetPrintPreviewDialogController(
|
| + new PrintPreviewDialogControllerTest(GetContext()));
|
| +#endif
|
| PrintPreviewDialogController* dialog_controller =
|
| PrintPreviewDialogController::GetInstance();
|
| ASSERT_TRUE(dialog_controller);
|
| @@ -197,6 +217,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);
|
| +
|
| + new_preview_dialog->Close();
|
| + initiator->Close();
|
| }
|
|
|
| // Test that print preview dialogs close on navigation to new pages
|
| @@ -226,9 +249,14 @@ TEST_F(PrintPreviewDialogControllerUnitTest, CloseDialogOnNavigation) {
|
| EXPECT_EQ(tiger, web_contents->GetLastCommittedURL());
|
|
|
| // Get the preview dialog
|
| +#if defined(USE_AURA)
|
| + TestingBrowserProcess::GetGlobal()->SetPrintPreviewDialogController(
|
| + new PrintPreviewDialogControllerTest(GetContext()));
|
| +#endif
|
| PrintPreviewDialogController* dialog_controller =
|
| PrintPreviewDialogController::GetInstance();
|
| ASSERT_TRUE(dialog_controller);
|
| +
|
| WebContents* tiger_preview_dialog =
|
| dialog_controller->GetOrCreatePreviewDialog(web_contents);
|
| PrintViewManager* manager = PrintViewManager::FromWebContents(web_contents);
|
| @@ -307,6 +335,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
|
| @@ -325,6 +355,10 @@ 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)
|
| + TestingBrowserProcess::GetGlobal()->SetPrintPreviewDialogController(
|
| + new PrintPreviewDialogControllerTest(GetContext()));
|
| +#endif
|
| PrintPreviewDialogController* dialog_controller =
|
| PrintPreviewDialogController::GetInstance();
|
| ASSERT_TRUE(dialog_controller);
|
|
|