| Index: chrome/browser/extensions/window_open_apitest.cc
|
| diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc
|
| index 5cc06773b1c639366333688dfc8f9a0fc0001465..61f954b7f1670f644c91c5bf1c0ad8bca4854d49 100644
|
| --- a/chrome/browser/extensions/window_open_apitest.cc
|
| +++ b/chrome/browser/extensions/window_open_apitest.cc
|
| @@ -83,8 +83,7 @@ bool WaitForTabsAndPopups(Browser* browser,
|
| const base::TimeDelta kWaitTime = base::TimeDelta::FromSeconds(10);
|
| base::TimeTicks end_time = base::TimeTicks::Now() + kWaitTime;
|
| while (base::TimeTicks::Now() < end_time) {
|
| - if (chrome::GetBrowserCount(browser->profile(),
|
| - browser->host_desktop_type()) == num_browsers &&
|
| + if (chrome::GetBrowserCount(browser->profile()) == num_browsers &&
|
| browser->tab_strip_model()->count() == num_tabs &&
|
| GetPanelCount(browser) == num_panels)
|
| break;
|
| @@ -92,9 +91,7 @@ bool WaitForTabsAndPopups(Browser* browser,
|
| content::RunAllPendingInMessageLoop();
|
| }
|
|
|
| - EXPECT_EQ(num_browsers,
|
| - chrome::GetBrowserCount(browser->profile(),
|
| - browser->host_desktop_type()));
|
| + EXPECT_EQ(num_browsers, chrome::GetBrowserCount(browser->profile()));
|
| EXPECT_EQ(num_tabs, browser->tab_strip_model()->count());
|
| EXPECT_EQ(num_panels, GetPanelCount(browser));
|
|
|
| @@ -108,9 +105,7 @@ bool WaitForTabsAndPopups(Browser* browser,
|
| }
|
| EXPECT_EQ(num_popups, num_popups_seen);
|
|
|
| - return ((num_browsers ==
|
| - chrome::GetBrowserCount(browser->profile(),
|
| - browser->host_desktop_type())) &&
|
| + return ((num_browsers == chrome::GetBrowserCount(browser->profile())) &&
|
| (num_tabs == browser->tab_strip_model()->count()) &&
|
| (num_panels == GetPanelCount(browser)) &&
|
| (num_popups == num_popups_seen));
|
|
|