Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(487)

Unified Diff: components/policy/core/common/registry_dict_win.cc

Issue 665663002: 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
Index: components/policy/core/common/registry_dict_win.cc
diff --git a/components/policy/core/common/registry_dict_win.cc b/components/policy/core/common/registry_dict_win.cc
index 3da5622b02d6690c43188b688231bbe7d236af49..964a83fb4678a81c3de8f707f608099894263c29 100644
--- a/components/policy/core/common/registry_dict_win.cc
+++ b/components/policy/core/common/registry_dict_win.cc
@@ -53,9 +53,9 @@ scoped_ptr<base::Value> ConvertValue(const base::Value& value,
if (converted)
result->Append(converted.release());
}
- return result.PassAs<base::Value>();
+ return result.Pass();
}
- return make_scoped_ptr(value.DeepCopy()).Pass();
+ return make_scoped_ptr(value.DeepCopy());
}
// Else, do some conversions to map windows registry data types to JSON types.
@@ -108,7 +108,7 @@ scoped_ptr<base::Value> ConvertValue(const base::Value& value,
if (converted)
result->Append(converted.release());
}
- return result.PassAs<base::Value>();
+ return result.Pass();
}
// Fall through in order to accept lists encoded as JSON strings.
}

Powered by Google App Engine
This is Rietveld 408576698