chrome/browser/chromeos/file_manager/external_filesystem_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/chromeos/file_manager/external_filesystem_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/chromeos/extensions/wallpaper_private_api_unittest.cc ('k') | chrome/browser/chromeos/file_manager/file_manager_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc

diff --git a/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc b/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc

index 87a2adeabaec2e8840ca50cbf84570aa8e64b466..ecdfb71629ff4ffd071bd365b1c634fa9c367a80 100644

--- a/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc

+++ b/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc

@@ -11,7 +11,6 @@

#include "chrome/browser/chromeos/drive/drive_integration_service.h"

#include "chrome/browser/chromeos/file_manager/drive_test_util.h"

#include "chrome/browser/chromeos/file_manager/volume_manager.h"

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

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

#include "chrome/browser/drive/fake_drive_service.h"

#include "chrome/browser/extensions/extension_apitest.h"

@@ -20,6 +19,7 @@

#include "chrome/browser/ui/browser.h"

#include "chrome/common/chrome_constants.h"

#include "chrome/common/chrome_paths.h"

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

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

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

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

@@ -511,9 +511,8 @@ class MultiProfileDriveFileSystemExtensionApiTest :

virtual void SetUpOnMainThread() OVERRIDE {

base::FilePath user_data_directory;

PathService::Get(chrome::DIR_USER_DATA, &user_data_directory);

- chromeos::UserManager::Get()->UserLoggedIn(kSecondProfileAccount,

- kSecondProfileHash,

- false);

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

+ kSecondProfileAccount, kSecondProfileHash, false);

// Set up the secondary profile.

base::FilePath profile_dir =

user_data_directory.Append(