Add scoped_ptr-safe base::Value to Dictionary/List conversion functions.

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 94 matching lines @@
       extension_dir_(extension_dir),
       extension_id_(extension_id),
       location_(location),
       creation_flags_(creation_flags) {
   internal_data_.reset(new InternalData());
 }
 
 Unpacker::~Unpacker() {
 }
 
-base::DictionaryValue* Unpacker::ReadManifest() {
+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));
   if (!root.get()) {
     SetError(error);
     return NULL;
   }
 
   if (!root->IsType(base::Value::TYPE_DICTIONARY)) {
     SetError(errors::kInvalidManifest);
     return NULL;
   }
 
-  return static_cast<base::DictionaryValue*>(root.release());
+  return base::DictionaryValue::From(root.Pass());
 }
 
 bool Unpacker::ReadAllMessageCatalogs(const std::string& default_locale) {
   base::FilePath locales_path = extension_dir_.Append(kLocaleFolder);
 
   // Not all folders under _locales have to be valid locales.
   base::FileEnumerator locales(locales_path, false,
                                base::FileEnumerator::DIRECTORIES);
 
   std::set<std::string> all_locales;
   extension_l10n_util::GetAllLocales(&all_locales);
   base::FilePath locale_path;
   while (!(locale_path = locales.Next()).empty()) {
     if (extension_l10n_util::ShouldSkipValidation(locales_path, locale_path,
                                                   all_locales))
       continue;
 
     base::FilePath messages_path = locale_path.Append(kMessagesFilename);
 
     if (!ReadMessageCatalog(messages_path))
       return false;
   }
 
   return true;
 }
 
 bool Unpacker::Run() {
   // Parse the manifest.
-  parsed_manifest_.reset(ReadManifest());
+  parsed_manifest_ = ReadManifest();
   if (!parsed_manifest_.get())
     return false;  // Error was already reported.
 
   std::string error;
   scoped_refptr<Extension> extension(
       Extension::Create(extension_dir_, location_, *parsed_manifest_,
                         creation_flags_, extension_id_, &error));
   if (!extension.get()) {
     SetError(error);
     return false;
@@ skipping 71 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(static_cast<base::DictionaryValue*>(
-      deserializer.Deserialize(NULL, &error)));
+  scoped_ptr<base::DictionaryValue> root = base::DictionaryValue::From(
+      make_scoped_ptr(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