Index: chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc |
diff --git a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc |
index e7bda7989ef36931f24809ad292c399df962f597..c7b8661cd4ac7ff755ce5038773e0d6d4b153086 100644 |
--- a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc |
+++ b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc |
@@ -180,13 +180,9 @@ class PopupBlockerBrowserTest : public InProcessBrowserTest { |
observer.Wait(); |
if (what_to_expect == ExpectPopup) { |
- ASSERT_EQ(2u, |
- chrome::GetBrowserCount(browser()->profile(), |
- browser()->host_desktop_type())); |
+ ASSERT_EQ(2u, chrome::GetBrowserCount(browser()->profile())); |
} else { |
- ASSERT_EQ(1u, |
- chrome::GetBrowserCount(browser()->profile(), |
- browser()->host_desktop_type())); |
+ ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile())); |
ASSERT_EQ(2, browser()->tab_strip_model()->count()); |
// Check that we always create foreground tabs. |
@@ -217,8 +213,7 @@ class PopupBlockerBrowserTest : public InProcessBrowserTest { |
// Since the popup blocker blocked the window.open, there should be only one |
// tab. |
- EXPECT_EQ(1u, chrome::GetBrowserCount(browser->profile(), |
- browser->host_desktop_type())); |
+ EXPECT_EQ(1u, chrome::GetBrowserCount(browser->profile())); |
EXPECT_EQ(1, browser->tab_strip_model()->count()); |
WebContents* web_contents = |
browser->tab_strip_model()->GetActiveWebContents(); |
@@ -557,8 +552,7 @@ IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, Regress427477) { |
tab->GetController().GoBack(); |
content::WaitForLoadStop(tab); |
- ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile(), |
- browser()->host_desktop_type())); |
+ ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile())); |
ASSERT_EQ(1, browser()->tab_strip_model()->count()); |
// The popup from the unload event handler should not show up for about:blank. |
@@ -678,8 +672,7 @@ IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, CtrlEnterKey) { |
#endif |
wait_for_new_tab.Wait(); |
- ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile(), |
- browser()->host_desktop_type())); |
+ ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile())); |
ASSERT_EQ(2, browser()->tab_strip_model()->count()); |
// Check that we create the background tab. |
ASSERT_EQ(0, browser()->tab_strip_model()->active_index()); |
@@ -707,8 +700,7 @@ IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, TapGestureWithCtrlKey) { |
wait_for_new_tab.Wait(); |
- ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile(), |
- browser()->host_desktop_type())); |
+ ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile())); |
ASSERT_EQ(2, browser()->tab_strip_model()->count()); |
// Check that we create the background tab. |
ASSERT_EQ(0, browser()->tab_strip_model()->active_index()); |