chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.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/extensions/api/braille_display_private/braille_display_private_apitest.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/extensions/api/autotest_private/autotest_private_api.cc ('k') | chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc

diff --git a/chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc b/chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc

index ae2300c492b816cb94b3ed13535d8ccdb98ba29a..41e9dcbc19afaccd55c060623c75c31e1b153bde 100644

--- a/chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc

+++ b/chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc

@@ -13,7 +13,6 @@

#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"

#include "chrome/browser/chromeos/login/lock/screen_locker.h"

#include "chrome/browser/chromeos/login/lock/screen_locker_tester.h"

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

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

#include "chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h"

#include "chrome/browser/extensions/api/braille_display_private/braille_display_private_api.h"

@@ -23,6 +22,7 @@

#include "chrome/browser/profiles/profile_manager.h"

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

#include "chromeos/chromeos_switches.h"

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

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

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

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

@@ -30,7 +30,7 @@

using chromeos::ProfileHelper;

using chromeos::ScreenLocker;

-using chromeos::UserManager;

+using user_manager::UserManager;

using chromeos::test::ScreenLockerTester;

using content::BrowserThread;

@@ -327,8 +327,9 @@ IN_PROC_BROWSER_TEST_F(BrailleDisplayPrivateAPIUserTest,

KeyEventOnLockScreen) {

scoped_ptr<ScreenLockerTester> tester(ScreenLocker::GetTester());

// Log in.

- UserManager::Get()->UserLoggedIn(kTestUserName, kTestUserName, true);

- UserManager::Get()->SessionStarted();

+ user_manager::UserManager::Get()->UserLoggedIn(

+ kTestUserName, kTestUserName, true);

+ user_manager::UserManager::Get()->SessionStarted();

Profile* profile = ProfileManager::GetActiveUserProfile();

ASSERT_FALSE(

ProfileHelper::GetSigninProfile()->IsSameProfile(profile))