Make printing work better with OOPIF. (try 2)

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..3fd3180c16cdcd8c18031adf288b7988cac5905e 100644
--- a/chrome/browser/printing/print_preview_dialog_controller_unittest.cc
+++ b/chrome/browser/printing/print_preview_dialog_controller_unittest.cc
@@ -70,7 +70,8 @@ TEST_F(PrintPreviewDialogControllerUnitTest, GetOrCreatePreviewDialog) {
   ASSERT_TRUE(dialog_controller);
 
   // Get the preview dialog for initiator.
-  PrintViewManager::FromWebContents(initiator)->PrintPreviewNow(false);
+  PrintViewManager::FromWebContents(initiator)->PrintPreviewNow(
+      initiator->GetMainFrame(), false);
   WebContents* preview_dialog =
       dialog_controller->GetOrCreatePreviewDialog(initiator);
 
@@ -116,7 +117,8 @@ TEST_F(PrintPreviewDialogControllerUnitTest, MultiplePreviewDialogs) {
   ASSERT_TRUE(dialog_controller);
 
   // Create preview dialog for |web_contents_1|
-  PrintViewManager::FromWebContents(web_contents_1)->PrintPreviewNow(false);
+  PrintViewManager::FromWebContents(web_contents_1)
+      ->PrintPreviewNow(web_contents_1->GetMainFrame(), false);
   WebContents* preview_dialog_1 =
       dialog_controller->GetOrCreatePreviewDialog(web_contents_1);
 
@@ -124,7 +126,8 @@ TEST_F(PrintPreviewDialogControllerUnitTest, MultiplePreviewDialogs) {
   EXPECT_EQ(2, tab_strip_model->count());
 
   // Create preview dialog for |web_contents_2|
-  PrintViewManager::FromWebContents(web_contents_2)->PrintPreviewNow(false);
+  PrintViewManager::FromWebContents(web_contents_2)
+      ->PrintPreviewNow(web_contents_2->GetMainFrame(), false);
   WebContents* preview_dialog_2 =
       dialog_controller->GetOrCreatePreviewDialog(web_contents_2);
 
@@ -172,7 +175,8 @@ TEST_F(PrintPreviewDialogControllerUnitTest, ClearInitiatorDetails) {
   ASSERT_TRUE(dialog_controller);
 
   // Get the preview dialog for the initiator.
-  PrintViewManager::FromWebContents(initiator)->PrintPreviewNow(false);
+  PrintViewManager::FromWebContents(initiator)->PrintPreviewNow(
+      initiator->GetMainFrame(), false);
   WebContents* preview_dialog =
       dialog_controller->GetOrCreatePreviewDialog(initiator);
 
@@ -228,7 +232,7 @@ TEST_F(PrintPreviewDialogControllerUnitTest, CloseDialogOnNavigation) {
   WebContents* tiger_preview_dialog =
       dialog_controller->GetOrCreatePreviewDialog(web_contents);
   PrintViewManager* manager = PrintViewManager::FromWebContents(web_contents);
-  manager->PrintPreviewNow(false);
+  manager->PrintPreviewNow(web_contents->GetMainFrame(), false);
 
   // New print preview dialog is a constrained window, so the number of tabs is
   // still 1.
@@ -247,7 +251,7 @@ TEST_F(PrintPreviewDialogControllerUnitTest, CloseDialogOnNavigation) {
 
   // 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(false));
+  EXPECT_TRUE(manager->PrintPreviewNow(web_contents->GetMainFrame(), false));
   WebContents* tiger_barb_preview_dialog =
       dialog_controller->GetOrCreatePreviewDialog(web_contents);
   ASSERT_TRUE(tiger_barb_preview_dialog);
@@ -261,13 +265,13 @@ TEST_F(PrintPreviewDialogControllerUnitTest, CloseDialogOnNavigation) {
       tiger_barb_preview_dialog);
 
   // Now this returns false as |tiger_barb_preview_dialog| is open.
-  EXPECT_FALSE(manager->PrintPreviewNow(false));
+  EXPECT_FALSE(manager->PrintPreviewNow(web_contents->GetMainFrame(), 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(false));
+  EXPECT_TRUE(manager->PrintPreviewNow(web_contents->GetMainFrame(), false));
 
   // Get new dialog
   WebContents* tiger_preview_dialog_2 =
@@ -296,7 +300,7 @@ TEST_F(PrintPreviewDialogControllerUnitTest, CloseDialogOnNavigation) {
   // 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(false));
+  EXPECT_FALSE(manager->PrintPreviewNow(web_contents->GetMainFrame(), false));
   EXPECT_FALSE(tiger_2_destroyed.dialog_destroyed());
   WebContents* tiger_preview_dialog_2b =
       dialog_controller->GetOrCreatePreviewDialog(web_contents);
@@ -326,7 +330,8 @@ TEST_F(PrintPreviewDialogControllerUnitTest, MultiplePreviewDialogsClose) {
   ASSERT_TRUE(dialog_controller);
 
   // Create preview dialog for |web_contents_1|. Should not create a new tab.
-  PrintViewManager::FromWebContents(web_contents_1)->PrintPreviewNow(false);
+  PrintViewManager::FromWebContents(web_contents_1)
+      ->PrintPreviewNow(web_contents_1->GetMainFrame(), false);
   WebContents* preview_dialog_1 =
       dialog_controller->GetOrCreatePreviewDialog(web_contents_1);
   EXPECT_NE(web_contents_1, preview_dialog_1);
@@ -339,7 +344,8 @@ TEST_F(PrintPreviewDialogControllerUnitTest, MultiplePreviewDialogsClose) {
   EXPECT_EQ(2, tab_strip_model->count());
 
   // Create preview dialog for |web_contents_2|
-  PrintViewManager::FromWebContents(web_contents_2)->PrintPreviewNow(false);
+  PrintViewManager::FromWebContents(web_contents_2)
+      ->PrintPreviewNow(web_contents_2->GetMainFrame(), false);
   WebContents* preview_dialog_2 =
       dialog_controller->GetOrCreatePreviewDialog(web_contents_2);
   EXPECT_NE(web_contents_2, preview_dialog_2);