Index: chrome/browser/profiles/profile_manager_browsertest.cc |
diff --git a/chrome/browser/profiles/profile_manager_browsertest.cc b/chrome/browser/profiles/profile_manager_browsertest.cc |
index 543e112b67d858fb76bf9014f200ca17ef331f04..e9b7ef98aa1713f9f04b55f03a160a9836b179f3 100644 |
--- a/chrome/browser/profiles/profile_manager_browsertest.cc |
+++ b/chrome/browser/profiles/profile_manager_browsertest.cc |
@@ -323,30 +323,26 @@ IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, |
// terminated by OnUnblockOnProfileCreation when the profile is created. |
run_loop.Run(); |
- chrome::HostDesktopType desktop_type = chrome::GetActiveDesktop(); |
BrowserList* browser_list = BrowserList::GetInstance(); |
ASSERT_EQ(initial_profile_count + 1, cache.GetNumberOfProfiles()); |
EXPECT_EQ(1U, browser_list->size()); |
// Open a browser window for the first profile. |
- profiles::SwitchToProfile(path_profile1, desktop_type, false, |
- kOnProfileSwitchDoNothing, |
+ profiles::SwitchToProfile(path_profile1, false, kOnProfileSwitchDoNothing, |
ProfileMetrics::SWITCH_PROFILE_ICON); |
EXPECT_EQ(1U, chrome::GetTotalBrowserCount()); |
EXPECT_EQ(1U, browser_list->size()); |
EXPECT_EQ(path_profile1, browser_list->get(0)->profile()->GetPath()); |
// Open a browser window for the second profile. |
- profiles::SwitchToProfile(path_profile2, desktop_type, false, |
- kOnProfileSwitchDoNothing, |
+ profiles::SwitchToProfile(path_profile2, false, kOnProfileSwitchDoNothing, |
ProfileMetrics::SWITCH_PROFILE_ICON); |
EXPECT_EQ(2U, chrome::GetTotalBrowserCount()); |
EXPECT_EQ(2U, browser_list->size()); |
EXPECT_EQ(path_profile2, browser_list->get(1)->profile()->GetPath()); |
// Switch to the first profile without opening a new window. |
- profiles::SwitchToProfile(path_profile1, desktop_type, false, |
- kOnProfileSwitchDoNothing, |
+ profiles::SwitchToProfile(path_profile1, false, kOnProfileSwitchDoNothing, |
ProfileMetrics::SWITCH_PROFILE_ICON); |
EXPECT_EQ(2U, chrome::GetTotalBrowserCount()); |
EXPECT_EQ(2U, browser_list->size()); |
@@ -392,22 +388,19 @@ IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, MAYBE_EphemeralProfile) { |
// Spin to allow profile creation to take place. |
content::RunMessageLoop(); |
- chrome::HostDesktopType desktop_type = chrome::GetActiveDesktop(); |
BrowserList* browser_list = BrowserList::GetInstance(); |
ASSERT_EQ(initial_profile_count + 1, cache.GetNumberOfProfiles()); |
EXPECT_EQ(1U, browser_list->size()); |
// Open a browser window for the second profile. |
- profiles::SwitchToProfile(path_profile2, desktop_type, false, |
- kOnProfileSwitchDoNothing, |
+ profiles::SwitchToProfile(path_profile2, false, kOnProfileSwitchDoNothing, |
ProfileMetrics::SWITCH_PROFILE_ICON); |
EXPECT_EQ(2U, chrome::GetTotalBrowserCount()); |
EXPECT_EQ(2U, browser_list->size()); |
EXPECT_EQ(path_profile2, browser_list->get(1)->profile()->GetPath()); |
// Create a second window for the ephemeral profile. |
- profiles::SwitchToProfile(path_profile2, desktop_type, true, |
- kOnProfileSwitchDoNothing, |
+ profiles::SwitchToProfile(path_profile2, true, kOnProfileSwitchDoNothing, |
ProfileMetrics::SWITCH_PROFILE_ICON); |
EXPECT_EQ(3U, chrome::GetTotalBrowserCount()); |
EXPECT_EQ(3U, browser_list->size()); |