chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.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/chromeos/login/signin/merge_session_load_page_unittest.cc

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

Patch Set: similarity 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

« chrome/browser/chromeos/first_run/first_run.cc ('K') | « chrome/browser/chromeos/login/signin/auth_sync_observer.cc ('k') | chrome/browser/chromeos/login/signin/merge_session_throttle.cc » ('j') | chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc

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

index e0e90a086e5b29559293ea3da1a482fa549aacf9..8ce8a709a016027c35784cceaa01c021e921637c 100644

--- a/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc

+++ b/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc

@@ -7,10 +7,11 @@

#include "chrome/browser/chromeos/login/signin/merge_session_load_page.h"

#include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"

#include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"

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

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

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

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

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

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

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

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

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