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

Unified Diff: chrome/browser/component_updater/recovery_component_installer.cc

Issue 1394993004: Make ValueDeserializer::Deserialize return scoped_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix and add ::From Created 5 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: chrome/browser/component_updater/recovery_component_installer.cc
diff --git a/chrome/browser/component_updater/recovery_component_installer.cc b/chrome/browser/component_updater/recovery_component_installer.cc
index 3657d6458dc7cc6f3c6ec177e04c57e3825b0800..e038a06a19b2d76fa9ac3d95c53ce4a963ad6edd 100644
--- a/chrome/browser/component_updater/recovery_component_installer.cc
+++ b/chrome/browser/component_updater/recovery_component_installer.cc
@@ -118,10 +118,9 @@ base::CommandLine GetRecoveryInstallCommandLine(
scoped_ptr<base::DictionaryValue> ReadManifest(const base::FilePath& manifest) {
JSONFileValueDeserializer deserializer(manifest);
std::string error;
- scoped_ptr<base::Value> root(deserializer.Deserialize(NULL, &error));
+ scoped_ptr<base::Value> root = deserializer.Deserialize(NULL, &error);
if (root.get() && root->IsType(base::Value::TYPE_DICTIONARY)) {
Lei Zhang 2015/10/14 16:46:14 Is this redundant?
- return scoped_ptr<base::DictionaryValue>(
- static_cast<base::DictionaryValue*>(root.release()));
+ return base::DictionaryValue::From(root.Pass());
}
return scoped_ptr<base::DictionaryValue>();
}

Powered by Google App Engine
This is Rietveld 408576698