chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc - Issue 824683002: UserManager stack refactoring.

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/ash/session_state_delegate_chromeos_unittest.cc

Issue 824683002: UserManager stack refactoring. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Test fixed. Created 5 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/ash/launcher/chrome_launcher_controller_unittest.cc ('k') | chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc

diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc b/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc

index 8f0b79fa52ccfc0e1b573d642607a8cebb5188f4..37da1a4b3fe777eef99a943fa45dbad43a1addf9 100644

--- a/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc

+++ b/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc

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

#include <vector>

#include "base/run_loop.h"

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

+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"

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

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

#include "chrome/browser/chromeos/policy/policy_cert_service.h"

@@ -50,8 +50,9 @@ class SessionStateDelegateChromeOSTest : public testing::Test {

~SessionStateDelegateChromeOSTest() override {}

void SetUp() override {

- // Initialize the UserManager singleton to a fresh FakeUserManager instance.

- user_manager_ = new chromeos::FakeUserManager;

+ // Initialize the UserManager singleton to a fresh FakeChromeUserManager

+ // instance.

+ user_manager_ = new FakeChromeUserManager;

user_manager_enabler_.reset(

new chromeos::ScopedUserManagerEnabler(user_manager_));

@@ -89,7 +90,7 @@ class SessionStateDelegateChromeOSTest : public testing::Test {

return user_manager::UserManager::Get()->GetActiveUser()->email();

}

- chromeos::FakeUserManager* user_manager() { return user_manager_; }

+ FakeChromeUserManager* user_manager() { return user_manager_; }

SessionStateDelegateChromeos* session_state_delegate() {

return session_state_delegate_.get();

}

@@ -119,7 +120,7 @@ class SessionStateDelegateChromeOSTest : public testing::Test {

scoped_ptr<SessionStateDelegateChromeos> session_state_delegate_;

// Not owned.

- chromeos::FakeUserManager* user_manager_;

+ FakeChromeUserManager* user_manager_;

DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateChromeOSTest);

};