Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2661)

Unified Diff: chrome/browser/printing/print_preview_dialog_controller_unittest.cc

Issue 2510753002: Revert of Make printing work better with OOPIF. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 3fd3180c16cdcd8c18031adf288b7988cac5905e..4bb9631f34eaa8a4d10115e3b5d294f3e03529ac 100644
--- a/chrome/browser/printing/print_preview_dialog_controller_unittest.cc
+++ b/chrome/browser/printing/print_preview_dialog_controller_unittest.cc
@@ -70,8 +70,7 @@
ASSERT_TRUE(dialog_controller);
// Get the preview dialog for initiator.
- PrintViewManager::FromWebContents(initiator)->PrintPreviewNow(
- initiator->GetMainFrame(), false);
+ PrintViewManager::FromWebContents(initiator)->PrintPreviewNow(false);
WebContents* preview_dialog =
dialog_controller->GetOrCreatePreviewDialog(initiator);
@@ -117,8 +116,7 @@
ASSERT_TRUE(dialog_controller);
// Create preview dialog for |web_contents_1|
- PrintViewManager::FromWebContents(web_contents_1)
- ->PrintPreviewNow(web_contents_1->GetMainFrame(), false);
+ PrintViewManager::FromWebContents(web_contents_1)->PrintPreviewNow(false);
WebContents* preview_dialog_1 =
dialog_controller->GetOrCreatePreviewDialog(web_contents_1);
@@ -126,8 +124,7 @@
EXPECT_EQ(2, tab_strip_model->count());
// Create preview dialog for |web_contents_2|
- PrintViewManager::FromWebContents(web_contents_2)
- ->PrintPreviewNow(web_contents_2->GetMainFrame(), false);
+ PrintViewManager::FromWebContents(web_contents_2)->PrintPreviewNow(false);
WebContents* preview_dialog_2 =
dialog_controller->GetOrCreatePreviewDialog(web_contents_2);
@@ -175,8 +172,7 @@
ASSERT_TRUE(dialog_controller);
// Get the preview dialog for the initiator.
- PrintViewManager::FromWebContents(initiator)->PrintPreviewNow(
- initiator->GetMainFrame(), false);
+ PrintViewManager::FromWebContents(initiator)->PrintPreviewNow(false);
WebContents* preview_dialog =
dialog_controller->GetOrCreatePreviewDialog(initiator);
@@ -232,7 +228,7 @@
WebContents* tiger_preview_dialog =
dialog_controller->GetOrCreatePreviewDialog(web_contents);
PrintViewManager* manager = PrintViewManager::FromWebContents(web_contents);
- manager->PrintPreviewNow(web_contents->GetMainFrame(), false);
+ manager->PrintPreviewNow(false);
// New print preview dialog is a constrained window, so the number of tabs is
// still 1.
@@ -251,7 +247,7 @@
// Print preview now should return true as the navigation should have closed
// |tiger_preview_dialog| and the previous dialog should have closed.
- EXPECT_TRUE(manager->PrintPreviewNow(web_contents->GetMainFrame(), false));
+ EXPECT_TRUE(manager->PrintPreviewNow(false));
WebContents* tiger_barb_preview_dialog =
dialog_controller->GetOrCreatePreviewDialog(web_contents);
ASSERT_TRUE(tiger_barb_preview_dialog);
@@ -265,13 +261,13 @@
tiger_barb_preview_dialog);
// Now this returns false as |tiger_barb_preview_dialog| is open.
- EXPECT_FALSE(manager->PrintPreviewNow(web_contents->GetMainFrame(), false));
+ EXPECT_FALSE(manager->PrintPreviewNow(false));
// Navigate with back button or ALT+LEFT ARROW to a similar page.
nav_controller.GoBack();
CommitPendingLoad(&nav_controller);
EXPECT_EQ(tiger, web_contents->GetLastCommittedURL());
- EXPECT_TRUE(manager->PrintPreviewNow(web_contents->GetMainFrame(), false));
+ EXPECT_TRUE(manager->PrintPreviewNow(false));
// Get new dialog
WebContents* tiger_preview_dialog_2 =
@@ -300,7 +296,7 @@
// preview now should return false, dialog is still alive, and the dialog
// returned by GetOrCreatePreviewDialog should be the same as the earlier
// dialog.
- EXPECT_FALSE(manager->PrintPreviewNow(web_contents->GetMainFrame(), false));
+ EXPECT_FALSE(manager->PrintPreviewNow(false));
EXPECT_FALSE(tiger_2_destroyed.dialog_destroyed());
WebContents* tiger_preview_dialog_2b =
dialog_controller->GetOrCreatePreviewDialog(web_contents);
@@ -330,8 +326,7 @@
ASSERT_TRUE(dialog_controller);
// Create preview dialog for |web_contents_1|. Should not create a new tab.
- PrintViewManager::FromWebContents(web_contents_1)
- ->PrintPreviewNow(web_contents_1->GetMainFrame(), false);
+ PrintViewManager::FromWebContents(web_contents_1)->PrintPreviewNow(false);
WebContents* preview_dialog_1 =
dialog_controller->GetOrCreatePreviewDialog(web_contents_1);
EXPECT_NE(web_contents_1, preview_dialog_1);
@@ -344,8 +339,7 @@
EXPECT_EQ(2, tab_strip_model->count());
// Create preview dialog for |web_contents_2|
- PrintViewManager::FromWebContents(web_contents_2)
- ->PrintPreviewNow(web_contents_2->GetMainFrame(), false);
+ PrintViewManager::FromWebContents(web_contents_2)->PrintPreviewNow(false);
WebContents* preview_dialog_2 =
dialog_controller->GetOrCreatePreviewDialog(web_contents_2);
EXPECT_NE(web_contents_2, preview_dialog_2);

Powered by Google App Engine
This is Rietveld 408576698