Print Preview: Correctly rewrite PrintPreviewDialogControllerBrowserTest.

Print Preview: Correctly rewrite PrintPreviewDialogControllerBrowserTest.

The previous version of the test would just create the print preview dialog it is checking for if the dialog was not created already.

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=210097

[Lei Zhang, 2013-07-02 18:29:08]

PTAL. The existing test is wrong since it just creates the dialog we want to
check for.

[Vitaly Buka (NO REVIEWS), 2013-07-03 21:17:34]

lgtm

[commit-bot: I haz the power, 2013-07-03 21:34:14]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/thestig@chromium.org/18422004/1

[commit-bot: I haz the power, 2013-07-03 21:34:17]

Failed to apply patch for
chrome/browser/printing/print_preview_dialog_controller_browsertest.cc:
While running patch -p0 --forward --force --no-backup-if-mismatch;
  patching file
chrome/browser/printing/print_preview_dialog_controller_browsertest.cc
  Hunk #2 FAILED at 18.
  1 out of 4 hunks FAILED -- saving rejects to file
chrome/browser/printing/print_preview_dialog_controller_browsertest.cc.rej

Patch:      
chrome/browser/printing/print_preview_dialog_controller_browsertest.cc
Index: chrome/browser/printing/print_preview_dialog_controller_browsertest.cc
===================================================================
---
chrome/browser/printing/print_preview_dialog_controller_browsertest.cc	(revision
209532)
+++
chrome/browser/printing/print_preview_dialog_controller_browsertest.cc	(working
copy)
@@ -3,12 +3,14 @@
 // found in the LICENSE file.
 
 #include "base/command_line.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/run_loop.h"
 #include "chrome/browser/printing/print_preview_dialog_controller.h"
-#include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/print_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ -16,75 +18,176 @@
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "googleurl/src/gurl.h"
+#include "ipc/ipc_message_macros.h"
 
 using content::WebContents;
+using content::WebContentsObserver;
 
-class PrintPreviewDialogControllerBrowserTest : public InProcessBrowserTest {
+class RequestPrintPreviewObserver : public WebContentsObserver {
  public:
-  PrintPreviewDialogControllerBrowserTest() {}
-  virtual ~PrintPreviewDialogControllerBrowserTest() {}
+  explicit RequestPrintPreviewObserver(WebContents* dialog)
+      : WebContentsObserver(dialog) {
+  }
+  virtual ~RequestPrintPreviewObserver() {}
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-#if !defined(GOOGLE_CHROME_BUILD)
-    command_line->AppendSwitch(switches::kEnablePrintPreview);
-#endif
+  void set_quit_closure(const base::Closure& quit_closure) {
+    quit_closure_ = quit_closure;
   }
+
+ private:
+  // content::WebContentsObserver implementation.
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
+    IPC_BEGIN_MESSAGE_MAP(RequestPrintPreviewObserver, message)
+      IPC_MESSAGE_HANDLER(PrintHostMsg_RequestPrintPreview,
+                          OnRequestPrintPreview)
+      IPC_MESSAGE_UNHANDLED(break;)
+    IPC_END_MESSAGE_MAP();
+    return false;  // Report not handled so the real handler receives it.
+  }
+
+  void OnRequestPrintPreview(
+      const PrintHostMsg_RequestPrintPreview_Params& /* params */) {
+    base::MessageLoop::current()->PostTask(FROM_HERE, quit_closure_);
+  }
+
+  base::Closure quit_closure_;
+
+  DISALLOW_COPY_AND_ASSIGN(RequestPrintPreviewObserver);
 };
 
-class PrintPreviewDialogDestroyedObserver
-    : public content::WebContentsObserver {
+class PrintPreviewDialogClonedObserver : public WebContentsObserver {
  public:
+  explicit PrintPreviewDialogClonedObserver(WebContents* dialog)
+      : WebContentsObserver(dialog) {
+  }
+  virtual ~PrintPreviewDialogClonedObserver() {}
+
+  RequestPrintPreviewObserver* request_preview_tab_observer() {
+    return request_preview_tab_observer_.get();
+  }
+
+ private:
+  // content::WebContentsObserver implementation.
+  virtual void DidCloneToNewWebContents(
+      WebContents* old_web_contents,
+      WebContents* new_web_contents) OVERRIDE {
+    request_preview_tab_observer_.reset(
+        new RequestPrintPreviewObserver(new_web_contents));
+  }
+
+  scoped_ptr<RequestPrintPreviewObserver> request_preview_tab_observer_;
+
+  DISALLOW_COPY_AND_ASSIGN(PrintPreviewDialogClonedObserver);
+};
+
+class PrintPreviewDialogDestroyedObserver : public WebContentsObserver {
+ public:
   explicit PrintPreviewDialogDestroyedObserver(WebContents* dialog)
-      : content::WebContentsObserver(dialog),
+      : WebContentsObserver(dialog),
         dialog_destroyed_(false) {
   }
   virtual ~PrintPreviewDialogDestroyedObserver() {}
 
-  bool dialog_destroyed() { return dialog_destroyed_; }
+  bool dialog_destroyed() const { return dialog_destroyed_; }
 
  private:
+  // content::WebContentsObserver implementation.
   virtual void WebContentsDestroyed(WebContents* contents) OVERRIDE {
     dialog_destroyed_ = true;
   }
 
   bool dialog_destroyed_;
+
+  DISALLOW_COPY_AND_ASSIGN(PrintPreviewDialogDestroyedObserver);
 };
 
+class PrintPreviewDialogControllerBrowserTest : public InProcessBrowserTest {
+ public:
+  PrintPreviewDialogControllerBrowserTest() : initiator_tab_(NULL) {}
+  virtual ~PrintPreviewDialogControllerBrowserTest() {}
+
+  WebContents* initiator_tab() {
+    return initiator_tab_;
+  }
+
+  void PrintPreview() {
+    base::RunLoop run_loop;
+    request_preview_tab_observer()->set_quit_closure(run_loop.QuitClosure());
+    chrome::Print(browser());
+    run_loop.Run();
+  }
+
+  WebContents* GetPrintPreviewDialog() {
+    printing::PrintPreviewDialogController* dialog_controller =
+        printing::PrintPreviewDialogController::GetInstance();
+    return dialog_controller->GetPrintPreviewForContents(initiator_tab_);
+  }
+
+ private:
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+#if !defined(GOOGLE_CHROME_BUILD)
+    command_line->AppendSwitch(switches::kEnablePrintPreview);
+#endif
+  }
+
+  virtual void SetUpOnMainThread() OVERRIDE {
+    WebContents* first_tab =
+        browser()->tab_strip_model()->GetActiveWebContents();
+    ASSERT_TRUE(first_tab);
+
+    // Open a new tab so |cloned_tab_observer_| can see it first and attach a
+    // RequestPrintPreviewObserver to it before the real
+    // PrintPreviewMessageHandler gets created. Thus enabling
+    // RequestPrintPreviewObserver to get messages first for the purposes of
+    // this test.
+    cloned_tab_observer_.reset(new
PrintPreviewDialogClonedObserver(first_tab));
+    chrome::DuplicateTab(browser());
+
+    initiator_tab_ = browser()->tab_strip_model()->GetActiveWebContents();
+    ASSERT_TRUE(initiator_tab_);
+    ASSERT_NE(first_tab, initiator_tab_);
+  }
+
+  virtual void CleanUpOnMainThread() OVERRIDE {
+    cloned_tab_observer_.reset();
+    initiator_tab_ = NULL;
+  }
+
+  RequestPrintPreviewObserver* request_preview_tab_observer() {
+    return cloned_tab_observer_->request_preview_tab_observer();
+  }
+
+  scoped_ptr<PrintPreviewDialogClonedObserver> cloned_tab_observer_;
+  WebContents* initiator_tab_;
+
+  DISALLOW_COPY_AND_ASSIGN(PrintPreviewDialogControllerBrowserTest);
+};
+
 // Test to verify that when a initiator tab navigates, we can create a new
 // preview dialog for the new tab contents.
 IN_PROC_BROWSER_TEST_F(PrintPreviewDialogControllerBrowserTest,
                        NavigateFromInitiatorTab) {
-  // Create a reference to initiator tab contents.
-  WebContents* initiator_tab =
-      browser()->tab_strip_model()->GetActiveWebContents();
-  ASSERT_TRUE(initiator_tab);
+  // print for the first time.
+  PrintPreview();
 
-  printing::PrintPreviewDialogController* dialog_controller =
-      printing::PrintPreviewDialogController::GetInstance();
-  ASSERT_TRUE(dialog_controller);
-
   // Get the preview dialog for the initiator tab.
-  printing::PrintViewManager* print_view_manager =
-      printing::PrintViewManager::FromWebContents(initiator_tab);
-  print_view_manager->PrintPreviewNow(false);
-  WebContents* preview_dialog =
-      dialog_controller->GetOrCreatePreviewDialog(initiator_tab);
+  WebContents* preview_dialog = GetPrintPreviewDialog();
 
   // Check a new print preview dialog got created.
   ASSERT_TRUE(preview_dialog);
-  ASSERT_NE(initiator_tab, preview_dialog);
+  ASSERT_NE(initiator_tab(), preview_dialog);
 
   // Navigate in the initiator tab. Make sure navigating destroys the print
   // preview dialog.
-  PrintPreviewDialogDestroyedObserver observer(preview_dialog);
-  GURL url(chrome::kChromeUINewTabURL);
-  ui_test_utils::NavigateToURL(browser(), url);
-  ASSERT_TRUE(observer.dialog_destroyed());
+  PrintPreviewDialogDestroyedObserver
dialog_destroyed_observer(preview_dialog);
+  ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL));
+  ASSERT_TRUE(dialog_destroyed_observer.dialog_destroyed());
 
+  // Try printing again.
+  PrintPreview();
+
   // Get the print preview dialog for the initiator tab.
-  print_view_manager->PrintPreviewNow(false);
-  WebContents* new_preview_dialog =
-      dialog_controller->GetOrCreatePreviewDialog(initiator_tab);
+  WebContents* new_preview_dialog = GetPrintPreviewDialog();
 
   // Check a new preview dialog got created.
   EXPECT_TRUE(new_preview_dialog);
@@ -94,25 +197,14 @@
 // print preview dialog.
 IN_PROC_BROWSER_TEST_F(PrintPreviewDialogControllerBrowserTest,
                        ReloadInitiatorTab) {
-  // Create a reference to initiator tab contents.
-  WebContents* initiator_tab =
-      browser()->tab_strip_model()->GetActiveWebContents();
-  ASSERT_TRUE(initiator_tab);
+  // print for the first time.
+  PrintPreview();
 
-  printing::PrintPreviewDialogController* dialog_controller =
-      printing::PrintPreviewDialogController::GetInstance();
-  ASSERT_TRUE(dialog_controller);
+  WebContents* preview_dialog = GetPrintPreviewDialog();
 
-  // Create a preview dialog for the initiator tab.
-  printing::PrintViewManager* print_view_manager =
-      printing::PrintViewManager::FromWebContents(initiator_tab);
-  print_view_manager->PrintPreviewNow(false);
-  WebContents* preview_dialog =
-      dialog_controller->GetOrCreatePreviewDialog(initiator_tab);
-
   // Check a new print prev…
(message too large)

[commit-bot: I haz the power, 2013-07-03 21:53:51]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/thestig@chromium.org/18422004/10001

[commit-bot: I haz the power, 2013-07-04 01:39:04]

Change committed as 210097