Make ValueDeserializer::Deserialize return scoped_ptr

chrome/browser/component_updater/recovery_component_installer.cc

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..4674282d93ffc4a3ef6a5713ae4ae1397b40df70 100644
--- a/chrome/browser/component_updater/recovery_component_installer.cc
+++ b/chrome/browser/component_updater/recovery_component_installer.cc
@@ -118,10 +118,10 @@ 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));
-  if (root.get() && root->IsType(base::Value::TYPE_DICTIONARY)) {
-    return scoped_ptr<base::DictionaryValue>(
-        static_cast<base::DictionaryValue*>(root.release()));
+  scoped_ptr<base::DictionaryValue> root =
+      base::DictionaryValue::From(deserializer.Deserialize(NULL, &error));
+  if (root) {

[Lei Zhang, 2015/10/15 17:36:11]

We don't need this either. Just return |root| ... we don't need |root| either,
just return base::DictionaryValue::From(...)

+    return root;
   }
   return scoped_ptr<base::DictionaryValue>();
 }