chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

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/webui/options/chromeos/accounts_options_browsertest.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 4 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/webui/options/browser_options_handler.cc ('k') | chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc b/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc

index f2b4880fa4e3c686d09eab4d8dddef52e09fd7d7..db1d4fa6baca218b66c707bae166052a531ddf5d 100644

--- a/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc

+++ b/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc

@@ -8,7 +8,6 @@

#include "chrome/browser/chromeos/login/login_manager_test.h"

#include "chrome/browser/chromeos/login/startup_utils.h"

#include "chrome/browser/chromeos/login/ui/user_adding_screen.h"

-#include "chrome/browser/chromeos/login/users/user_manager.h"

#include "chrome/browser/chromeos/profiles/profile_helper.h"

#include "chrome/browser/chromeos/settings/cros_settings.h"

#include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"

@@ -18,6 +17,7 @@

#include "chrome/common/pref_names.h"

#include "chrome/test/base/ui_test_utils.h"

#include "chromeos/settings/cros_settings_names.h"

+#include "components/user_manager/user_manager.h"

#include "content/public/browser/web_contents.h"

#include "content/public/test/browser_test_utils.h"

#include "content/public/test/test_utils.h"

@@ -136,7 +136,7 @@ IN_PROC_BROWSER_TEST_F(AccountsOptionsTest, MultiProfilesAccountsOptions) {

content::RunAllPendingInMessageLoop();

AddUser(kTestUsers[1]);

- UserManager* manager = UserManager::Get();

+ user_manager::UserManager* manager = user_manager::UserManager::Get();

ASSERT_EQ(2u, manager->GetLoggedInUsers().size());

CheckAccountsUI(manager->FindUser(kTestUsers[0]), true /* is_owner */);