Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5649)

Unified Diff: chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc

Issue 12334073: Remove WebContents methods that duplicate WebContentsView methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
index b85f9fc272569111ad336475ba38d0e3558d7834..15b6eb25a9372930d7492cc0c9b57eebe77fcac3 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
@@ -19,12 +19,10 @@
#include "content/public/browser/plugin_service.h"
#include "content/public/browser/site_instance.h"
#include "content/public/browser/web_contents.h"
-#include "content/public/test/web_contents_tester.h"
#include "printing/print_job_constants.h"
#include "webkit/plugins/npapi/mock_plugin_list.h"
using content::WebContents;
-using content::WebContentsTester;
namespace {
@@ -239,40 +237,3 @@ TEST_F(PrintPreviewUIUnitTest, GetCurrentPrintPreviewStatus) {
&cancel);
EXPECT_FALSE(cancel);
}
-
-TEST_F(PrintPreviewUIUnitTest, InitiatorTabGetsFocusOnPrintPreviewDialogClose) {
- EXPECT_EQ(1, browser()->tab_strip_model()->count());
- WebContents* initiator_tab =
- WebContentsTester::CreateTestWebContentsCountFocus(profile(), NULL);
- WebContentsTester* initiator_tester = WebContentsTester::For(initiator_tab);
- chrome::AddWebContents(browser(), NULL, initiator_tab,
- NEW_FOREGROUND_TAB, gfx::Rect(), false, NULL);
- EXPECT_EQ(2, browser()->tab_strip_model()->count());
- EXPECT_EQ(0, initiator_tester->GetNumberOfFocusCalls());
-
- printing::PrintPreviewDialogController* controller =
- printing::PrintPreviewDialogController::GetInstance();
- ASSERT_TRUE(controller);
-
- printing::PrintViewManager* print_view_manager =
- printing::PrintViewManager::FromWebContents(initiator_tab);
- print_view_manager->PrintPreviewNow(false);
- WebContents* preview_dialog =
- controller->GetOrCreatePreviewDialog(initiator_tab);
-
- EXPECT_NE(initiator_tab, preview_dialog);
- EXPECT_EQ(2, browser()->tab_strip_model()->count());
- EXPECT_TRUE(IsShowingWebContentsModalDialog(initiator_tab));
- EXPECT_EQ(0, initiator_tester->GetNumberOfFocusCalls());
-
- PrintPreviewUI* preview_ui = static_cast<PrintPreviewUI*>(
- preview_dialog->GetWebUI()->GetController());
- ASSERT_TRUE(preview_ui != NULL);
-
- preview_ui->OnPrintPreviewDialogClosed();
- message_loop()->RunUntilIdle();
-
- EXPECT_EQ(2, browser()->tab_strip_model()->count());
- EXPECT_FALSE(IsShowingWebContentsModalDialog(initiator_tab));
- EXPECT_EQ(1, initiator_tester->GetNumberOfFocusCalls());
-}
« no previous file with comments | « chrome/browser/ui/webui/print_preview/print_preview_ui_interactive_browsertest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698