chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc - Issue 494093002: OwnerKeyUtil 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 494093002: OwnerKeyUtil is moved to components/ownership. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed GYP file. 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/chrome_browser_main_chromeos.cc ('k') | chrome/browser/chromeos/ownership/owner_settings_service.h » ('j') | no next file with comments »
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 23dfccc69cf81fc52de4d3fca95eb32023719c02..634cd41e4c485768ab4aa95b96cacd7c5da9f5d4 100644

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

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

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

#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"

-#include "chrome/browser/chromeos/settings/mock_owner_key_util.h"

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

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

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

@@ -39,6 +38,7 @@

#include "chromeos/login/auth/mock_url_fetchers.h"

#include "chromeos/login/auth/test_attempt_state.h"

#include "chromeos/login/auth/user_context.h"

+#include "components/ownership/mock_owner_key_util.h"

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

#include "crypto/nss_util_internal.h"

#include "crypto/scoped_test_nss_chromeos_user.h"

@@ -123,7 +123,7 @@ class CryptohomeAuthenticatorTest : public testing::Test {

user_manager_enabler_(user_manager_),

mock_caller_(NULL),

mock_homedir_methods_(NULL),

- owner_key_util_(new MockOwnerKeyUtil) {

+ owner_key_util_(new ownership::MockOwnerKeyUtil) {

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

user_context_.SetUserIDHash("me_nowhere_com_hash");

const user_manager::User* user =

@@ -282,7 +282,7 @@ class CryptohomeAuthenticatorTest : public testing::Test {

scoped_ptr<TestAttemptState> state_;

FakeCryptohomeClient* fake_cryptohome_client_;

- scoped_refptr<MockOwnerKeyUtil> owner_key_util_;

+ scoped_refptr<ownership::MockOwnerKeyUtil> owner_key_util_;

};

TEST_F(CryptohomeAuthenticatorTest, OnAuthSuccess) {