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

Unified Diff: chromeos/network/onc/onc_validator.cc

Issue 21030009: Make element removal methods in DictionaryValue and ListValue take scoped_ptr's as outparams. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 7 years, 4 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: chromeos/network/onc/onc_validator.cc
diff --git a/chromeos/network/onc/onc_validator.cc b/chromeos/network/onc/onc_validator.cc
index 540d5a7cea06ddfc44b1a5db01ef0047316776f8..0d92b0aa7a3f744f80d23d1a4c12596bdcca1b9d 100644
--- a/chromeos/network/onc/onc_validator.cc
+++ b/chromeos/network/onc/onc_validator.cc
@@ -237,15 +237,15 @@ bool Validator::ValidateRecommendedField(
CHECK(result != NULL);
scoped_ptr<base::ListValue> recommended;
- base::Value* recommended_value = NULL;
+ scoped_ptr<base::Value> recommended_value;
// This remove passes ownership to |recommended_value|.
if (!result->RemoveWithoutPathExpansion(onc::kRecommended,
&recommended_value)) {
return true;
}
base::ListValue* recommended_list = NULL;
- recommended_value->GetAsList(&recommended_list);
- CHECK(recommended_list != NULL);
+ recommended_value.release()->GetAsList(&recommended_list);
+ CHECK(recommended_list);
recommended.reset(recommended_list);
« no previous file with comments | « chromeos/network/onc/onc_certificate_importer_impl_unittest.cc ('k') | cloud_print/service/win/chrome_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698