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

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

Issue 8564044: Revert 110056 - Print Preview: Make print preview tab modal. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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
« no previous file with comments | « chrome/browser/ui/webui/print_preview_ui_uitest.cc ('k') | chrome/browser/ui/webui/web_ui_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/print_preview_ui_unittest.cc
===================================================================
--- chrome/browser/ui/webui/print_preview_ui_unittest.cc (revision 110058)
+++ chrome/browser/ui/webui/print_preview_ui_unittest.cc (working copy)
@@ -8,7 +8,6 @@
#include "base/memory/ref_counted_memory.h"
#include "chrome/browser/printing/print_preview_tab_controller.h"
#include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/constrained_window_tab_helper.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/browser/ui/webui/print_preview_ui.h"
#include "chrome/common/chrome_switches.h"
@@ -22,10 +21,6 @@
const unsigned char blob1[] =
"12346102356120394751634516591348710478123649165419234519234512349134";
-size_t GetConstrainedWindowCount(TabContentsWrapper* tab) {
- return tab->constrained_window_tab_helper()->constrained_window_count();
-}
-
} // namespace
typedef BrowserWithTestWindowTest PrintPreviewUITest;
@@ -41,7 +36,6 @@
TabContentsWrapper* initiator_tab =
browser()->GetSelectedTabContentsWrapper();
ASSERT_TRUE(initiator_tab);
- EXPECT_EQ(0U, GetConstrainedWindowCount(initiator_tab));
scoped_refptr<printing::PrintPreviewTabController>
controller(new printing::PrintPreviewTabController());
@@ -51,8 +45,7 @@
controller->GetOrCreatePreviewTab(initiator_tab);
EXPECT_NE(initiator_tab, preview_tab);
- EXPECT_EQ(1, browser()->tab_count());
- EXPECT_EQ(1U, GetConstrainedWindowCount(initiator_tab));
+ EXPECT_EQ(2, browser()->tab_count());
PrintPreviewUI* preview_ui =
reinterpret_cast<PrintPreviewUI*>(preview_tab->web_ui());
@@ -112,8 +105,7 @@
controller->GetOrCreatePreviewTab(initiator_tab);
EXPECT_NE(initiator_tab, preview_tab);
- EXPECT_EQ(1, browser()->tab_count());
- EXPECT_EQ(1U, GetConstrainedWindowCount(initiator_tab));
+ EXPECT_EQ(2, browser()->tab_count());
PrintPreviewUI* preview_ui =
reinterpret_cast<PrintPreviewUI*>(preview_tab->web_ui());
@@ -180,8 +172,7 @@
controller->GetOrCreatePreviewTab(initiator_tab);
EXPECT_NE(initiator_tab, preview_tab);
- EXPECT_EQ(1, browser()->tab_count());
- EXPECT_EQ(1U, GetConstrainedWindowCount(initiator_tab));
+ EXPECT_EQ(2, browser()->tab_count());
PrintPreviewUI* preview_ui =
reinterpret_cast<PrintPreviewUI*>(preview_tab->web_ui());
« no previous file with comments | « chrome/browser/ui/webui/print_preview_ui_uitest.cc ('k') | chrome/browser/ui/webui/web_ui_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698