chrome/browser/chromeos/policy/device_cloud_policy_invalidator_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/policy/device_cloud_policy_invalidator_unittest.cc

Issue 494093002: OwnerKeyUtil is moved to components/ownership. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixes. 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/ownership/owner_settings_service.cc ('k') | chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc » ('j') | components/ownership/owner_key_util.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc

diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc

index 5af385a53794a71f8a05036a385095fc00042c73..92de7def5c2e657948ce41085365b30c2963cf46 100644

--- a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc

+++ b/chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc

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

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

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

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

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

#include "chrome/browser/invalidation/fake_invalidation_service.h"

#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"

#include "chrome/browser/policy/cloud/cloud_policy_invalidator.h"

@@ -34,6 +33,7 @@

#include "components/invalidation/profile_invalidation_provider.h"

#include "components/invalidation/ticl_invalidation_service.h"

#include "components/keyed_service/core/keyed_service.h"

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

#include "components/policy/core/common/cloud/cloud_policy_client.h"

#include "components/policy/core/common/cloud/cloud_policy_constants.h"

#include "components/policy/core/common/cloud/cloud_policy_core.h"

@@ -129,8 +129,8 @@ void DeviceCloudPolicyInvalidatorTest::SetUp() {

test_device_settings_service_.reset(new

chromeos::ScopedTestDeviceSettingsService);

test_cros_settings_.reset(new chromeos::ScopedTestCrosSettings);

- scoped_refptr<chromeos::MockOwnerKeyUtil> owner_key_util(

- new chromeos::MockOwnerKeyUtil);

+ scoped_refptr<ownership::MockOwnerKeyUtil> owner_key_util(

+ new ownership::MockOwnerKeyUtil);

owner_key_util->SetPublicKeyFromPrivateKey(

*device_policy_.GetSigningKey());

chromeos::DeviceSettingsService::Get()->SetSessionManager(