chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc - Issue 1637943003: Remove HostDesktopType from BrowserList::GetInstance()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc

Issue 1637943003: Remove HostDesktopType from BrowserList::GetInstance() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@screen-wrapper-land

Patch Set: mac2 Created 4 years, 11 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/ui/tab_contents/tab_contents_iterator_unittest.cc ('k') | chrome/browser/ui/views/tabs/tab_drag_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc

diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc b/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc

index 798d1be47d9bf6a9d6a3a24529e6d4f4c9fbf656..f87126432bfabb87eceef03186dd98c3bee687be 100644

--- a/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc

+++ b/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc

@@ -253,7 +253,7 @@ IN_PROC_BROWSER_TEST_F(ProfileChooserViewExtensionsTest, DISABLED_LockProfile) {

ASSERT_TRUE(profiles::IsMultipleProfilesEnabled());

SetupProfilesForLock(browser()->profile());

- EXPECT_EQ(1U, BrowserList::GetInstance(chrome::GetActiveDesktop())->size());

+ EXPECT_EQ(1U, BrowserList::GetInstance()->size());

ASSERT_NO_FATAL_FAILURE(OpenProfileChooserView(browser()));

AvatarMenu* menu = GetProfileChooserViewAvatarMenu();

@@ -263,7 +263,7 @@ IN_PROC_BROWSER_TEST_F(ProfileChooserViewExtensionsTest, DISABLED_LockProfile) {

EXPECT_TRUE(menu->GetItemAt(menu->GetActiveProfileIndex()).signin_required);

window_close_observer()->Wait();

- EXPECT_TRUE(BrowserList::GetInstance(chrome::GetActiveDesktop())->empty());

+ EXPECT_TRUE(BrowserList::GetInstance()->empty());

WaitForUserManager();

// We need to hide the User Manager or else the process can't die.

@@ -309,12 +309,12 @@ IN_PROC_BROWSER_TEST_F(ProfileChooserViewExtensionsTest,

SetupProfilesForLock(signed_in);

extensions::ExtensionSystem::Get(signed_in)->InitForRegularProfile(true);

Browser* browser_to_lock = CreateBrowser(signed_in);

- EXPECT_EQ(2U, BrowserList::GetInstance(chrome::GetActiveDesktop())->size());

+ EXPECT_EQ(2U, BrowserList::GetInstance()->size());

ASSERT_NO_FATAL_FAILURE(OpenProfileChooserView(browser_to_lock));

ClickProfileChooserViewLockButton();

window_close_observer()->Wait();

- EXPECT_EQ(1U, BrowserList::GetInstance(chrome::GetActiveDesktop())->size());

+ EXPECT_EQ(1U, BrowserList::GetInstance()->size());

WaitForUserManager();

// Assert that the first profile's extensions are not blocked.