Revert 212329 "Reland "Close web contents modal dialogs on conte..."

trunk/src/chrome/browser/printing/print_preview_dialog_controller_browsertest.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 "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/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ skipping 85 matching lines @@
     dialog_destroyed_ = true;
   }
 
   bool dialog_destroyed_;
 
   DISALLOW_COPY_AND_ASSIGN(PrintPreviewDialogDestroyedObserver);
 };
 
 class PrintPreviewDialogControllerBrowserTest : public InProcessBrowserTest {
  public:
-  PrintPreviewDialogControllerBrowserTest() : initiator_(NULL) {}
+  PrintPreviewDialogControllerBrowserTest() : initiator_tab_(NULL) {}
   virtual ~PrintPreviewDialogControllerBrowserTest() {}
 
-  WebContents* initiator() {
-    return initiator_;
+  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_);
+    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_ = browser()->tab_strip_model()->GetActiveWebContents();
-    ASSERT_TRUE(initiator_);
-    ASSERT_NE(first_tab, initiator_);
+    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_ = NULL;
+    initiator_tab_ = NULL;
   }
 
   RequestPrintPreviewObserver* request_preview_tab_observer() {
     return cloned_tab_observer_->request_preview_tab_observer();
   }
 
   scoped_ptr<PrintPreviewDialogClonedObserver> cloned_tab_observer_;
-  WebContents* initiator_;
+  WebContents* initiator_tab_;
 
   DISALLOW_COPY_AND_ASSIGN(PrintPreviewDialogControllerBrowserTest);
 };
 
-// Test to verify that when a initiator navigates, we can create a new preview
-// dialog for the new tab contents.
+// 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) {
   // print for the first time.
   PrintPreview();
 
   // Get the preview dialog for the initiator tab.
   WebContents* preview_dialog = GetPrintPreviewDialog();
 
   // Check a new print preview dialog got created.
   ASSERT_TRUE(preview_dialog);
-  ASSERT_NE(initiator(), preview_dialog);
+  ASSERT_NE(initiator_tab(), preview_dialog);
 
   // Navigate in the initiator tab. Make sure navigating destroys the print
   // preview dialog.
   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.
   WebContents* new_preview_dialog = GetPrintPreviewDialog();
 
   // Check a new preview dialog got created.
   EXPECT_TRUE(new_preview_dialog);
 }
 
-// Test to verify that after reloading the initiator, it creates a new print
-// preview dialog.
+// Test to verify that after reloading the initiator tab, it creates a new
+// print preview dialog.
 IN_PROC_BROWSER_TEST_F(PrintPreviewDialogControllerBrowserTest,
                        ReloadInitiatorTab) {
   // print for the first time.
   PrintPreview();
 
   WebContents* preview_dialog = GetPrintPreviewDialog();
 
   // Check a new print preview dialog got created.
   ASSERT_TRUE(preview_dialog);
-  ASSERT_NE(initiator(), preview_dialog);
+  ASSERT_NE(initiator_tab(), preview_dialog);
 
-  // Reload the initiator. Make sure reloading destroys the print preview
+  // Reload the initiator tab. Make sure reloading destroys the print preview
   // dialog.
   PrintPreviewDialogDestroyedObserver dialog_destroyed_observer(preview_dialog);
   content::WindowedNotificationObserver notification_observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
   chrome::Reload(browser(), CURRENT_TAB);
   notification_observer.Wait();
   ASSERT_TRUE(dialog_destroyed_observer.dialog_destroyed());
 
   // Try printing again.
   PrintPreview();
 
   // Create a preview dialog for the initiator tab.
   WebContents* new_preview_dialog = GetPrintPreviewDialog();
   EXPECT_TRUE(new_preview_dialog);
 }