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

Unified Diff: chrome/browser/extensions/window_open_apitest.cc

Issue 12315094: Remove kDefaultHostDesktopType from browser_finder.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix StartupBrowserCreatorTest.ProfilesWithoutPagesNotLaunched 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
« no previous file with comments | « chrome/browser/extensions/app_process_apitest.cc ('k') | chrome/browser/popup_blocker_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 d9b93b60ca32cbd7917900aacf5b0621dc14dc53..360e68cd813a11b85c1b25bccc00389876cd8422 100644
--- a/chrome/browser/extensions/window_open_apitest.cc
+++ b/chrome/browser/extensions/window_open_apitest.cc
@@ -73,7 +73,8 @@ 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()) == num_browsers &&
+ if (chrome::GetBrowserCount(browser->profile(),
+ browser->host_desktop_type()) == num_browsers &&
browser->tab_strip_model()->count() == num_tabs &&
GetPanelCount(browser) == num_panels)
break;
@@ -81,7 +82,9 @@ bool WaitForTabsAndPopups(Browser* browser,
content::RunAllPendingInMessageLoop();
}
- EXPECT_EQ(num_browsers, chrome::GetBrowserCount(browser->profile()));
+ EXPECT_EQ(num_browsers,
+ chrome::GetBrowserCount(browser->profile(),
+ browser->host_desktop_type()));
EXPECT_EQ(num_tabs, browser->tab_strip_model()->count());
EXPECT_EQ(num_panels, GetPanelCount(browser));
@@ -101,7 +104,9 @@ bool WaitForTabsAndPopups(Browser* browser,
}
EXPECT_EQ(num_popups, num_popups_seen);
- return ((num_browsers == chrome::GetBrowserCount(browser->profile())) &&
+ return ((num_browsers ==
+ chrome::GetBrowserCount(browser->profile(),
+ browser->host_desktop_type())) &&
(num_tabs == browser->tab_strip_model()->count()) &&
(num_panels == GetPanelCount(browser)) &&
(num_popups == num_popups_seen));
« no previous file with comments | « chrome/browser/extensions/app_process_apitest.cc ('k') | chrome/browser/popup_blocker_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698