chrome/browser/chromeos/login/crash_restore_browsertest.cc - Issue 398753004: [cros] Move User class to user_manager component.

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/chromeos/login/crash_restore_browsertest.cc

Issue 398753004: [cros] Move User class to user_manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 5 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/chromeos/login/auth/parallel_authenticator_unittest.cc ('k') | chrome/browser/chromeos/login/existing_user_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/crash_restore_browsertest.cc

diff --git a/chrome/browser/chromeos/login/crash_restore_browsertest.cc b/chrome/browser/chromeos/login/crash_restore_browsertest.cc

index e4eb8224df7f8ad99a1ed5d01db8723216e3b088..a5fa6092b9c5b530a46fc4a994393e587e35c777 100644

--- a/chrome/browser/chromeos/login/crash_restore_browsertest.cc

+++ b/chrome/browser/chromeos/login/crash_restore_browsertest.cc

@@ -9,7 +9,6 @@

#include "base/memory/ref_counted.h"

#include "base/run_loop.h"

#include "chrome/browser/chromeos/login/session/user_session_manager.h"

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

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

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

#include "chromeos/chromeos_switches.h"

@@ -17,6 +16,7 @@

#include "chromeos/dbus/fake_dbus_thread_manager.h"

#include "chromeos/dbus/fake_session_manager_client.h"

#include "chromeos/dbus/session_manager_client.h"

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

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

#include "testing/gmock/include/gmock/gmock.h"

#include "third_party/cros_system_api/dbus/service_constants.h"

@@ -60,7 +60,7 @@ class CrashRestoreSimpleTest : public InProcessBrowserTest {

IN_PROC_BROWSER_TEST_F(CrashRestoreSimpleTest, RestoreSessionForOneUser) {

UserManager* user_manager = UserManager::Get();

- User* user = user_manager->GetActiveUser();

+ user_manager::User* user = user_manager->GetActiveUser();

ASSERT_TRUE(user);

EXPECT_EQ(kUserId1, user->email());

EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId1),

@@ -133,12 +133,12 @@ IN_PROC_BROWSER_TEST_F(CrashRestoreComplexTest, RestoreSessionForThreeUsers) {

// User that is last in the user sessions map becomes active. This behavior

// will become better defined once each user gets a separate user desktop.

UserManager* user_manager = UserManager::Get();

- User* user = user_manager->GetActiveUser();

+ user_manager::User* user = user_manager->GetActiveUser();

ASSERT_TRUE(user);

EXPECT_EQ(kUserId3, user->email());

EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId3),

user->username_hash());

- const UserList& users = user_manager->GetLoggedInUsers();

+ const user_manager::UserList& users = user_manager->GetLoggedInUsers();

ASSERT_EQ(3UL, users.size());

// User that becomes active moves to the beginning of the list.