chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc - Issue 548323003: Non-plafrom-specific part of an OwnerSettingsService is moved to components/ownership/*.

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/auth/cryptohome_authenticator_unittest.cc

Issue 548323003: Non-plafrom-specific part of an OwnerSettingsService is moved to components/ownership/*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixes. Created 6 years, 3 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/login/auth/chrome_cryptohome_authenticator.cc ('k') | chrome/browser/chromeos/ownership/owner_settings_service.h » ('j') | components/ownership/DEPS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc

diff --git a/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc b/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc

index afd886381e41e00d938b25e26c428e10821c0fce..f14572c8d946da7f9161921ac016dbba33e63d9c 100644

--- a/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc

+++ b/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc

@@ -18,8 +18,8 @@

#include "base/strings/stringprintf.h"

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

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

-#include "chrome/browser/chromeos/ownership/owner_settings_service.h"

-#include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h"

+#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"

+#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"

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

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

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

@@ -135,8 +135,8 @@ class CryptohomeAuthenticatorTest : public testing::Test {

mock_caller_(NULL),

mock_homedir_methods_(NULL),

owner_key_util_(new ownership::MockOwnerKeyUtil()) {

- OwnerSettingsServiceFactory::GetInstance()->SetOwnerKeyUtilForTesting(

- owner_key_util_);

+ OwnerSettingsServiceChromeOSFactory::GetInstance()

+ ->SetOwnerKeyUtilForTesting(owner_key_util_);

user_context_.SetKey(Key("fakepass"));

user_context_.SetUserIDHash("me_nowhere_com_hash");

const user_manager::User* user =