Revert of Make printing work better with OOPIF.

chrome/browser/printing/print_preview_dialog_controller_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/printing/print_preview_dialog_controller.h"
 
 #include <memory>
 #include <string>
 
 #include "chrome/browser/printing/print_preview_test.h"
@@ skipping 52 matching lines @@
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
 
   // Create a reference to initiator contents.
   WebContents* initiator = browser()->tab_strip_model()->GetActiveWebContents();
 
   PrintPreviewDialogController* dialog_controller =
       PrintPreviewDialogController::GetInstance();
   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);
 
   // New print preview dialog is a constrained window, so the number of tabs is
   // still 1.
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
   EXPECT_NE(initiator, preview_dialog);
 
   // Get the print preview dialog for the same initiator.
   WebContents* new_preview_dialog =
@@ skipping 25 matching lines @@
   chrome::NewTab(browser());
   WebContents* web_contents_2 = tab_strip_model->GetActiveWebContents();
   ASSERT_TRUE(web_contents_2);
   EXPECT_EQ(2, tab_strip_model->count());
 
   PrintPreviewDialogController* dialog_controller =
       PrintPreviewDialogController::GetInstance();
   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);
 
   EXPECT_NE(web_contents_1, preview_dialog_1);
   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);
   EXPECT_NE(preview_dialog_1, preview_dialog_2);
   // 2 initiators and 2 preview dialogs exist in the same browser.  The preview
   // dialogs are constrained in their respective initiators.
   EXPECT_EQ(2, tab_strip_model->count());
 
   int tab_1_index = tab_strip_model->GetIndexOfWebContents(web_contents_1);
@@ skipping 27 matching lines @@
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
 
   // Create a reference to initiator contents.
   WebContents* initiator = browser()->tab_strip_model()->GetActiveWebContents();
 
   PrintPreviewDialogController* dialog_controller =
       PrintPreviewDialogController::GetInstance();
   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);
 
   // New print preview dialog is a constrained window, so the number of tabs is
   // still 1.
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
   EXPECT_NE(initiator, preview_dialog);
 
   // Clear the initiator details associated with the preview dialog.
   dialog_controller->EraseInitiatorInfo(preview_dialog);
@@ skipping 35 matching lines @@
   CommitPendingLoad(&nav_controller);
   EXPECT_EQ(tiger, web_contents->GetLastCommittedURL());
 
   // Get the preview dialog
   PrintPreviewDialogController* dialog_controller =
       PrintPreviewDialogController::GetInstance();
   ASSERT_TRUE(dialog_controller);
   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.
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
   EXPECT_NE(web_contents, tiger_preview_dialog);
   PrintPreviewDialogDestroyedObserver tiger_destroyed(tiger_preview_dialog);
 
   // Navigate via link to a similar page.
   nav_controller.LoadURL(tiger_barb, content::Referrer(),
                          ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK),
                          std::string());
   CommitPendingLoad(&nav_controller);
 
   // Check navigation was successful
   EXPECT_EQ(tiger_barb, web_contents->GetLastCommittedURL());
 
   // 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);
 
   // Check a new dialog was created - either the pointers should be different or
   // the previous web contents must have been destroyed.
   EXPECT_TRUE(tiger_destroyed.dialog_destroyed() ||
               tiger_barb_preview_dialog != tiger_preview_dialog);
   EXPECT_NE(tiger_barb_preview_dialog, web_contents);
   PrintPreviewDialogDestroyedObserver tiger_barb_destroyed(
       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 =
       dialog_controller->GetOrCreatePreviewDialog(web_contents);
   ASSERT_TRUE(tiger_preview_dialog_2);
 
   // Verify this is a new dialog.
   EXPECT_TRUE(tiger_barb_destroyed.dialog_destroyed() ||
               tiger_barb_preview_dialog != tiger_preview_dialog_2);
   EXPECT_NE(tiger_preview_dialog_2, web_contents);
   PrintPreviewDialogDestroyedObserver tiger_2_destroyed(
       tiger_preview_dialog_2);
 
   // Try to simulate Gmail navigation: Navigate to an existing page (via
   // Forward) but modify the navigation type while pending to look like an
   // address bar + typed transition (like Gmail auto navigation)
   nav_controller.GoForward();
   nav_controller.GetPendingEntry()->SetTransitionType(ui::PageTransitionFromInt(
       ui::PAGE_TRANSITION_TYPED | ui::PAGE_TRANSITION_FROM_ADDRESS_BAR));
   CommitPendingLoad(&nav_controller);
 
   // Navigation successful
   EXPECT_EQ(tiger_barb, web_contents->GetLastCommittedURL());
 
   // Print preview should not have changed due to this navigation type so print
   // 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);
   ASSERT_TRUE(tiger_preview_dialog_2b);
   EXPECT_EQ(tiger_preview_dialog_2b, tiger_preview_dialog_2);
   EXPECT_NE(tiger_preview_dialog_2b, web_contents);
 }
 
 // Tests preview dialog controller cleans up correctly and does not throw errors
 // on a renderer process crash. Checks that the renderer process closed
 // notification is still received even if one of two preview dialogs with the
 // same renderer process host is closed before the process "crashes".
 TEST_F(PrintPreviewDialogControllerUnitTest, MultiplePreviewDialogsClose) {
   // Set up the browser.
   EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
   TabStripModel* tab_strip_model = browser()->tab_strip_model();
   ASSERT_TRUE(tab_strip_model);
   EXPECT_EQ(0, tab_strip_model->count());
 
   // Create a new tab with contents |web_contents_1|
   chrome::NewTab(browser());
   WebContents* web_contents_1 = tab_strip_model->GetActiveWebContents();
   ASSERT_TRUE(web_contents_1);
   EXPECT_EQ(1, tab_strip_model->count());
   PrintPreviewDialogController* dialog_controller =
       PrintPreviewDialogController::GetInstance();
   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);
   EXPECT_EQ(1, tab_strip_model->count());
 
   // Create a new tab with contents |web_contents_2|
   chrome::NewTab(browser());
   WebContents* web_contents_2 = tab_strip_model->GetActiveWebContents();
   ASSERT_TRUE(web_contents_2);
   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);
   EXPECT_NE(preview_dialog_1, preview_dialog_2);
 
   // 2 initiators and 2 preview dialogs exist in the same browser.  The preview
   // dialogs are constrained in their respective initiators.
   EXPECT_EQ(2, tab_strip_model->count());
 
   // Close |web_contents_1|'s tab
   int tab_1_index = tab_strip_model->GetIndexOfWebContents(web_contents_1);
   tab_strip_model->CloseWebContentsAt(tab_1_index, 0);
   EXPECT_EQ(1, tab_strip_model->count());
 
   // Simulate a crash of the render process host for |web_contents_2|. Print
   // preview controller should exit cleanly and not crash.
   content::MockRenderProcessHost* rph =
       static_cast<content::MockRenderProcessHost*>(
           web_contents_2->GetRenderViewHost()->GetProcess());
   rph->SimulateCrash();
 }
 }  // namespace printing