chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc - Issue 24869003: cryptohome: Move stateless wrapper functions out of CryptohomeLibrary

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_manager_chromeos_unittest.cc

Issue 24869003: cryptohome: Move stateless wrapper functions out of CryptohomeLibrary (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: address comments Created 7 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/login_utils_browsertest.cc ('k') | chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index c509c4ec84586a40fc484d37a0192ce94e143c87..96904ae7a3625e858fe61c3c1f9ebe2a34f3b642 100644

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

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

@@ -60,8 +60,7 @@ class DeviceCloudPolicyManagerChromeOSTest

DeviceCloudPolicyManagerChromeOSTest()

: cryptohome_library_(chromeos::CryptohomeLibrary::GetTestImpl()),

fake_cryptohome_client_(new chromeos::FakeCryptohomeClient()),

- install_attributes_(cryptohome_library_.get(),

- fake_cryptohome_client_.get()),

+ install_attributes_(fake_cryptohome_client_.get()),

store_(new DeviceCloudPolicyStoreChromeOS(&device_settings_service_,

&install_attributes_)),

manager_(make_scoped_ptr(store_),

@@ -84,6 +83,8 @@ class DeviceCloudPolicyManagerChromeOSTest

request_context_getter_.get());

TestingBrowserProcess::GetGlobal()->SetLocalState(&local_state_);

chromeos::DeviceOAuth2TokenServiceFactory::Initialize();

+ // TODO(satorux): Remove CryptohomeLibrary::SetForTest() when it's ready.

+ // (removing it now breaks the unit test). crbug.com/141016.

chromeos::CryptohomeLibrary::SetForTest(cryptohome_library_.get());

url_fetcher_response_code_ = 200;

url_fetcher_response_string_ = "{\"access_token\":\"accessToken4Test\","