chrome/browser/chromeos/file_system_provider/mount_path_util_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/chromeos/file_system_provider/mount_path_util_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, 10 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_system_provider/service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/file_system_provider/mount_path_util_unittest.cc

diff --git a/chrome/browser/chromeos/file_system_provider/mount_path_util_unittest.cc b/chrome/browser/chromeos/file_system_provider/mount_path_util_unittest.cc

index ba0a05c21fbd0789f9129a5c0fabe4585fe6fea5..d8efb0062983c434ac8aabf83c76ce22299fb1d6 100644

--- a/chrome/browser/chromeos/file_system_provider/mount_path_util_unittest.cc

+++ b/chrome/browser/chromeos/file_system_provider/mount_path_util_unittest.cc

@@ -12,7 +12,7 @@

#include "chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h"

#include "chrome/browser/chromeos/file_system_provider/service.h"

#include "chrome/browser/chromeos/file_system_provider/service_factory.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/scoped_user_manager_enabler.h"

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

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

@@ -74,7 +74,7 @@ class FileSystemProviderMountPathUtilTest : public testing::Test {

new TestingProfileManager(TestingBrowserProcess::GetGlobal()));

ASSERT_TRUE(profile_manager_->SetUp());

profile_ = profile_manager_->CreateTestingProfile("testing-profile");

- user_manager_ = new FakeUserManager();

+ user_manager_ = new FakeChromeUserManager();

user_manager_enabler_.reset(new ScopedUserManagerEnabler(user_manager_));

user_manager_->AddUser(profile_->GetProfileName());

ServiceFactory::GetInstance()->SetTestingFactory(profile_, &CreateService);

@@ -93,7 +93,7 @@ class FileSystemProviderMountPathUtilTest : public testing::Test {

scoped_ptr<TestingProfileManager> profile_manager_;

TestingProfile* profile_; // Owned by TestingProfileManager.

scoped_ptr<ScopedUserManagerEnabler> user_manager_enabler_;

- FakeUserManager* user_manager_;

+ FakeChromeUserManager* user_manager_;

Service* file_system_provider_service_; // Owned by its factory.

};