components/policy/core/common/mac_util.cc - Issue 655143002: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<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: components/policy/core/common/mac_util.cc

Issue 655143002: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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 | « components/password_manager/core/browser/password_syncable_service_unittest.cc ('k') | components/policy/core/common/registry_dict_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/policy/core/common/mac_util.cc

diff --git a/components/policy/core/common/mac_util.cc b/components/policy/core/common/mac_util.cc

index d8f4693c032f3f2c45bcbbb4ce2fcae86a8040f7..a8b5fcbe4ef65f4b92cc7c7e5a8d04b90e97938d 100644

--- a/components/policy/core/common/mac_util.cc

+++ b/components/policy/core/common/mac_util.cc

@@ -77,7 +77,7 @@ scoped_ptr<base::Value> PropertyToValue(CFPropertyListRef property) {

if (CFDictionaryRef dict = CFCast<CFDictionaryRef>(property)) {

scoped_ptr<base::DictionaryValue> dict_value(new base::DictionaryValue());

CFDictionaryApplyFunction(dict, DictionaryEntryToValue, dict_value.get());

- return dict_value.PassAs<base::Value>();

+ return dict_value.Pass();

}

if (CFArrayRef array = CFCast<CFArrayRef>(property)) {

@@ -86,10 +86,10 @@ scoped_ptr<base::Value> PropertyToValue(CFPropertyListRef property) {

CFRangeMake(0, CFArrayGetCount(array)),

ArrayEntryToValue,

list_value.get());

- return list_value.PassAs<base::Value>();

+ return list_value.Pass();

}

- return scoped_ptr<base::Value>();

+ return nullptr;

}

} // namespace policy