Make ValueDeserializer::Deserialize return scoped_ptr

extensions/utility/unpacker.cc

 // Copyright (c) 2012 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 "extensions/utility/unpacker.h"
 
 #include <set>
 
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
@@ skipping 103 matching lines @@
 
 scoped_ptr<base::DictionaryValue> Unpacker::ReadManifest() {
   base::FilePath manifest_path = extension_dir_.Append(kManifestFilename);
   if (!base::PathExists(manifest_path)) {
     SetError(errors::kInvalidManifest);
     return NULL;
   }
 
   JSONFileValueDeserializer deserializer(manifest_path);
   std::string error;
-  scoped_ptr<base::Value> root(deserializer.Deserialize(NULL, &error));
+  scoped_ptr<base::Value> root = deserializer.Deserialize(NULL, &error);
   if (!root.get()) {
     SetError(error);
     return NULL;
   }
 
   if (!root->IsType(base::Value::TYPE_DICTIONARY)) {
     SetError(errors::kInvalidManifest);
     return NULL;
   }
 
@@ skipping 111 matching lines @@
     return false;
   }
 
   internal_data_->decoded_images.push_back(base::MakeTuple(image_bitmap, path));
   return true;
 }
 
 bool Unpacker::ReadMessageCatalog(const base::FilePath& message_path) {
   std::string error;
   JSONFileValueDeserializer deserializer(message_path);
-  scoped_ptr<base::DictionaryValue> root = base::DictionaryValue::From(
-      make_scoped_ptr(deserializer.Deserialize(NULL, &error)));
+  scoped_ptr<base::DictionaryValue> root =
+      base::DictionaryValue::From(deserializer.Deserialize(NULL, &error));
   if (!root.get()) {
     base::string16 messages_file = message_path.LossyDisplayName();
     if (error.empty()) {
       // If file is missing, Deserialize will fail with empty error.
       SetError(base::StringPrintf("%s %s", errors::kLocalesMessagesFileMissing,
                                   base::UTF16ToUTF8(messages_file).c_str()));
     } else {
       SetError(base::StringPrintf(
           "%s: %s", base::UTF16ToUTF8(messages_file).c_str(), error.c_str()));
     }
@@ skipping 19 matching lines @@
 
 void Unpacker::SetError(const std::string& error) {
   SetUTF16Error(base::UTF8ToUTF16(error));
 }
 
 void Unpacker::SetUTF16Error(const base::string16& error) {
   error_message_ = error;
 }
 
 }  // namespace extensions