chrome/browser/chromeos/settings/device_settings_test_helper.cc - Issue 567553002: TPMTokenLoader: Report both the disabled and enabled state of the TPM.

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/settings/device_settings_test_helper.cc

Issue 567553002: TPMTokenLoader: Report both the disabled and enabled state of the TPM. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nss_util_deadcode

Patch Set: Addressed nit. 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/settings/device_settings_service_unittest.cc ('k') | chrome/browser/chromeos/settings/session_manager_operation_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/settings/device_settings_test_helper.cc

diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.cc b/chrome/browser/chromeos/settings/device_settings_test_helper.cc

index 06fd21c3abe9cdb2d824ba271091bc00300b7c24..518e82466205638d61111d9626f84e3c9738420a 100644

--- a/chrome/browser/chromeos/settings/device_settings_test_helper.cc

+++ b/chrome/browser/chromeos/settings/device_settings_test_helper.cc

@@ -263,7 +263,7 @@ void DeviceSettingsTestBase::InitOwner(const std::string& user_id,

OwnerSettingsServiceFactory::GetForProfile(profile_.get());

CHECK(service);

if (tpm_is_ready)

- service->OnTPMTokenReady();

+ service->OnTPMTokenReady(true /* token is enabled */);

}

} // namespace chromeos