| 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 0055243bba4de000731437c0edaf7621a3de746a..9b123393a2058816673a3bea182ce48feeea65d9 100644
|
| --- a/chrome/browser/profiles/profile_manager_unittest.cc
|
| +++ b/chrome/browser/profiles/profile_manager_unittest.cc
|
| @@ -627,7 +627,7 @@ TEST_F(ProfileManagerTest, LastOpenedProfiles) {
|
| ASSERT_EQ(0U, last_opened_profiles.size());
|
|
|
| // Create a browser for profile1.
|
| - Browser::CreateParams profile1_params(profile1, chrome::GetActiveDesktop());
|
| + Browser::CreateParams profile1_params(profile1);
|
| scoped_ptr<Browser> browser1a(
|
| chrome::CreateBrowserWithTestWindowForParams(&profile1_params));
|
|
|
| @@ -636,7 +636,7 @@ TEST_F(ProfileManagerTest, LastOpenedProfiles) {
|
| EXPECT_EQ(profile1, last_opened_profiles[0]);
|
|
|
| // And for profile2.
|
| - Browser::CreateParams profile2_params(profile2, chrome::GetActiveDesktop());
|
| + Browser::CreateParams profile2_params(profile2);
|
| scoped_ptr<Browser> browser2(
|
| chrome::CreateBrowserWithTestWindowForParams(&profile2_params));
|
|
|
| @@ -689,12 +689,12 @@ TEST_F(ProfileManagerTest, LastOpenedProfilesAtShutdown) {
|
| ASSERT_TRUE(profile2);
|
|
|
| // Create a browser for profile1.
|
| - Browser::CreateParams profile1_params(profile1, chrome::GetActiveDesktop());
|
| + Browser::CreateParams profile1_params(profile1);
|
| scoped_ptr<Browser> browser1(
|
| chrome::CreateBrowserWithTestWindowForParams(&profile1_params));
|
|
|
| // And for profile2.
|
| - Browser::CreateParams profile2_params(profile2, chrome::GetActiveDesktop());
|
| + Browser::CreateParams profile2_params(profile2);
|
| scoped_ptr<Browser> browser2(
|
| chrome::CreateBrowserWithTestWindowForParams(&profile2_params));
|
|
|
| @@ -739,7 +739,7 @@ TEST_F(ProfileManagerTest, LastOpenedProfilesDoesNotContainIncognito) {
|
| ASSERT_EQ(0U, last_opened_profiles.size());
|
|
|
| // Create a browser for profile1.
|
| - Browser::CreateParams profile1_params(profile1, chrome::GetActiveDesktop());
|
| + Browser::CreateParams profile1_params(profile1);
|
| scoped_ptr<Browser> browser1(
|
| chrome::CreateBrowserWithTestWindowForParams(&profile1_params));
|
|
|
| @@ -748,8 +748,7 @@ TEST_F(ProfileManagerTest, LastOpenedProfilesDoesNotContainIncognito) {
|
| EXPECT_EQ(profile1, last_opened_profiles[0]);
|
|
|
| // And for profile2.
|
| - Browser::CreateParams profile2_params(profile1->GetOffTheRecordProfile(),
|
| - chrome::GetActiveDesktop());
|
| + Browser::CreateParams profile2_params(profile1->GetOffTheRecordProfile());
|
| scoped_ptr<Browser> browser2a(
|
| chrome::CreateBrowserWithTestWindowForParams(&profile2_params));
|
|
|
| @@ -799,7 +798,7 @@ TEST_F(ProfileManagerTest, EphemeralProfilesDontEndUpAsLastProfile) {
|
| EXPECT_NE(profile, last_used_profile);
|
|
|
| // Create a browser for the profile.
|
| - Browser::CreateParams profile_params(profile, chrome::GetActiveDesktop());
|
| + Browser::CreateParams profile_params(profile);
|
| scoped_ptr<Browser> browser(
|
| chrome::CreateBrowserWithTestWindowForParams(&profile_params));
|
| last_used_profile = profile_manager->GetLastUsedProfile();
|
| @@ -841,19 +840,16 @@ TEST_F(ProfileManagerTest, EphemeralProfilesDontEndUpAsLastOpenedAtShutdown) {
|
| ASSERT_TRUE(ephemeral_profile2);
|
|
|
| // Create a browser for profile1.
|
| - Browser::CreateParams profile1_params(normal_profile,
|
| - chrome::GetActiveDesktop());
|
| + Browser::CreateParams profile1_params(normal_profile);
|
| scoped_ptr<Browser> browser1(
|
| chrome::CreateBrowserWithTestWindowForParams(&profile1_params));
|
|
|
| // Create browsers for the ephemeral profile.
|
| - Browser::CreateParams profile2_params(ephemeral_profile1,
|
| - chrome::GetActiveDesktop());
|
| + Browser::CreateParams profile2_params(ephemeral_profile1);
|
| scoped_ptr<Browser> browser2(
|
| chrome::CreateBrowserWithTestWindowForParams(&profile2_params));
|
|
|
| - Browser::CreateParams profile3_params(ephemeral_profile2,
|
| - chrome::GetActiveDesktop());
|
| + Browser::CreateParams profile3_params(ephemeral_profile2);
|
| scoped_ptr<Browser> browser3(
|
| chrome::CreateBrowserWithTestWindowForParams(&profile3_params));
|
|
|
|
|