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

Unified Diff: chrome/browser/profiles/profile_manager_unittest.cc

Issue 16174003: Make all tests use GetActiveDesktop() instead of hardcoding HOST_DESKTOP_TYPE_NATIVE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/profiles/profile_manager_unittest.cc
diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc
index adaf53ac3db1cebc22dfab1971847e42cf02cdcf..c7cde5637b3f1ef299baa30b4a784332b860079c 100644
--- a/chrome/browser/profiles/profile_manager_unittest.cc
+++ b/chrome/browser/profiles/profile_manager_unittest.cc
@@ -475,8 +475,7 @@ TEST_F(ProfileManagerTest, LastOpenedProfiles) {
ASSERT_EQ(0U, last_opened_profiles.size());
// Create a browser for profile1.
- Browser::CreateParams profile1_params(profile1,
- chrome::HOST_DESKTOP_TYPE_NATIVE);
+ Browser::CreateParams profile1_params(profile1, chrome::GetActiveDesktop());
scoped_ptr<Browser> browser1a(
chrome::CreateBrowserWithTestWindowForParams(&profile1_params));
@@ -485,8 +484,7 @@ TEST_F(ProfileManagerTest, LastOpenedProfiles) {
EXPECT_EQ(profile1, last_opened_profiles[0]);
// And for profile2.
- Browser::CreateParams profile2_params(profile2,
- chrome::HOST_DESKTOP_TYPE_NATIVE);
+ Browser::CreateParams profile2_params(profile2, chrome::GetActiveDesktop());
scoped_ptr<Browser> browser2(
chrome::CreateBrowserWithTestWindowForParams(&profile2_params));
@@ -539,14 +537,12 @@ TEST_F(ProfileManagerTest, LastOpenedProfilesAtShutdown) {
ASSERT_TRUE(profile2);
// Create a browser for profile1.
- Browser::CreateParams profile1_params(profile1,
- chrome::HOST_DESKTOP_TYPE_NATIVE);
+ Browser::CreateParams profile1_params(profile1, chrome::GetActiveDesktop());
scoped_ptr<Browser> browser1(
chrome::CreateBrowserWithTestWindowForParams(&profile1_params));
// And for profile2.
- Browser::CreateParams profile2_params(profile2,
- chrome::HOST_DESKTOP_TYPE_NATIVE);
+ Browser::CreateParams profile2_params(profile2, chrome::GetActiveDesktop());
scoped_ptr<Browser> browser2(
chrome::CreateBrowserWithTestWindowForParams(&profile2_params));
@@ -598,8 +594,7 @@ TEST_F(ProfileManagerTest, LastOpenedProfilesDoesNotContainIncognito) {
ASSERT_EQ(0U, last_opened_profiles.size());
// Create a browser for profile1.
- Browser::CreateParams profile1_params(profile1,
- chrome::HOST_DESKTOP_TYPE_NATIVE);
+ Browser::CreateParams profile1_params(profile1, chrome::GetActiveDesktop());
scoped_ptr<Browser> browser1(
chrome::CreateBrowserWithTestWindowForParams(&profile1_params));
@@ -608,8 +603,7 @@ TEST_F(ProfileManagerTest, LastOpenedProfilesDoesNotContainIncognito) {
EXPECT_EQ(profile1, last_opened_profiles[0]);
// And for profile2.
- Browser::CreateParams profile2_params(profile2,
- chrome::HOST_DESKTOP_TYPE_NATIVE);
+ Browser::CreateParams profile2_params(profile2, chrome::GetActiveDesktop());
scoped_ptr<Browser> browser2a(
chrome::CreateBrowserWithTestWindowForParams(&profile2_params));
« no previous file with comments | « chrome/browser/profiles/avatar_menu_model_browsertest.cc ('k') | chrome/browser/sync/test/integration/sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698