chrome/browser/chromeos/policy/device_local_account_policy_store.cc - Issue 18308004: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*"

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

Issue 18308004: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 7 years, 6 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/kiosk_mode/kiosk_mode_screensaver.cc ('k') | chrome/browser/chromeos/screensaver/screensaver_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 133a4c8e56e4920b8d8ccc3a2131af7ba13d50bf..6ae5cd56c825af2dbbb7983f385ad465396513bc 100644

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

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

@@ -159,8 +159,9 @@ void DeviceLocalAccountPolicyStore::Validate(

bool is_owner) {

DCHECK_NE(chromeos::DeviceSettingsService::OWNERSHIP_UNKNOWN,

ownership_status);

- chromeos::OwnerKey* key = device_settings_service_->GetOwnerKey();

- if (!key || !key->public_key()) {

+ scoped_refptr<chromeos::OwnerKey> key =

+ device_settings_service_->GetOwnerKey();

+ if (!key.get() || !key->public_key()) {

status_ = CloudPolicyStore::STATUS_BAD_STATE;

NotifyStoreLoaded();

return;