Make ValueDeserializer::Deserialize return scoped_ptr

components/update_client/component_unpacker.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/update_client/component_unpacker.h"
 
 #include <stdint.h>
 #include <string>
 #include <vector>
 
@@ skipping 45 matching lines @@
 // extension unpacker will reject, so that a component cannot be installed
 // as an extension.
 scoped_ptr<base::DictionaryValue> ReadManifest(
     const base::FilePath& unpack_path) {
   base::FilePath manifest =
       unpack_path.Append(FILE_PATH_LITERAL("manifest.json"));
   if (!base::PathExists(manifest))
     return scoped_ptr<base::DictionaryValue>();
   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())
     return scoped_ptr<base::DictionaryValue>();
   if (!root->IsType(base::Value::TYPE_DICTIONARY))
     return scoped_ptr<base::DictionaryValue>();
   return scoped_ptr<base::DictionaryValue>(
              static_cast<base::DictionaryValue*>(root.release())).Pass();
 }
 
 bool ComponentUnpacker::UnpackInternal() {
   return Verify() && Unzip() && BeginPatching();
@@ skipping 129 matching lines @@
   if (!unpack_path_.empty())
     base::DeleteFile(unpack_path_, true);
   task_runner_->PostTask(FROM_HERE,
                          base::Bind(callback_, error_, extended_error_));
 }
 
 ComponentUnpacker::~ComponentUnpacker() {
 }
 
 }  // namespace update_client