Make printing work better with OOPIF. (try 2)

chrome/browser/ui/webui/print_preview/print_preview_ui_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 <stdint.h>
 
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted_memory.h"
@@ skipping 33 matching lines @@
 }  // namespace
 
 class PrintPreviewUIUnitTest : public PrintPreviewTest {
  public:
   PrintPreviewUIUnitTest();
   ~PrintPreviewUIUnitTest() override;
 
  protected:
   void SetUp() override;
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(PrintPreviewUIUnitTest);
 };
 
 PrintPreviewUIUnitTest::PrintPreviewUIUnitTest() {}
 PrintPreviewUIUnitTest::~PrintPreviewUIUnitTest() {}
 
 void PrintPreviewUIUnitTest::SetUp() {
   PrintPreviewTest::SetUp();
 
   chrome::NewTab(browser());
 }
 
 // Create/Get a preview tab for initiator.
 TEST_F(PrintPreviewUIUnitTest, PrintPreviewData) {
   WebContents* initiator = browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(initiator);
   EXPECT_FALSE(IsShowingWebContentsModalDialog(initiator));
 
   printing::PrintPreviewDialogController* controller =
       printing::PrintPreviewDialogController::GetInstance();
   ASSERT_TRUE(controller);
 
   printing::PrintViewManager* print_view_manager =
       printing::PrintViewManager::FromWebContents(initiator);
-  print_view_manager->PrintPreviewNow(false);
+  print_view_manager->PrintPreviewNow(initiator->GetMainFrame(), false);
   WebContents* preview_dialog = controller->GetOrCreatePreviewDialog(initiator);
 
   EXPECT_NE(initiator, preview_dialog);
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
   EXPECT_TRUE(IsShowingWebContentsModalDialog(initiator));
 
   PrintPreviewUI* preview_ui = static_cast<PrintPreviewUI*>(
       preview_dialog->GetWebUI()->GetController());
   ASSERT_TRUE(preview_ui != NULL);
 
@@ skipping 32 matching lines @@
 TEST_F(PrintPreviewUIUnitTest, PrintPreviewDraftPages) {
   WebContents* initiator = browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(initiator);
 
   printing::PrintPreviewDialogController* controller =
       printing::PrintPreviewDialogController::GetInstance();
   ASSERT_TRUE(controller);
 
   printing::PrintViewManager* print_view_manager =
       printing::PrintViewManager::FromWebContents(initiator);
-  print_view_manager->PrintPreviewNow(false);
+  print_view_manager->PrintPreviewNow(initiator->GetMainFrame(), false);
   WebContents* preview_dialog = controller->GetOrCreatePreviewDialog(initiator);
 
   EXPECT_NE(initiator, preview_dialog);
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
   EXPECT_TRUE(IsShowingWebContentsModalDialog(initiator));
 
   PrintPreviewUI* preview_ui = static_cast<PrintPreviewUI*>(
       preview_dialog->GetWebUI()->GetController());
   ASSERT_TRUE(preview_ui != NULL);
 
@@ skipping 39 matching lines @@
 TEST_F(PrintPreviewUIUnitTest, GetCurrentPrintPreviewStatus) {
   WebContents* initiator = browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(initiator);
 
   printing::PrintPreviewDialogController* controller =
       printing::PrintPreviewDialogController::GetInstance();
   ASSERT_TRUE(controller);
 
   printing::PrintViewManager* print_view_manager =
       printing::PrintViewManager::FromWebContents(initiator);
-  print_view_manager->PrintPreviewNow(false);
+  print_view_manager->PrintPreviewNow(initiator->GetMainFrame(), false);
   WebContents* preview_dialog = controller->GetOrCreatePreviewDialog(initiator);
 
   EXPECT_NE(initiator, preview_dialog);
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
   EXPECT_TRUE(IsShowingWebContentsModalDialog(initiator));
 
   PrintPreviewUI* preview_ui = static_cast<PrintPreviewUI*>(
       preview_dialog->GetWebUI()->GetController());
   ASSERT_TRUE(preview_ui != NULL);
 
@@ skipping 24 matching lines @@
   cancel = false;
   preview_ui->GetCurrentPrintPreviewStatus(preview_ui_addr, kFirstRequestId,
                                            &cancel);
   EXPECT_TRUE(cancel);
 
   cancel = true;
   preview_ui->GetCurrentPrintPreviewStatus(preview_ui_addr, kSecondRequestId,
                                            &cancel);
   EXPECT_FALSE(cancel);
 }