Make ValueDeserializer::Deserialize return scoped_ptr

chrome/browser/extensions/external_pref_loader.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 "chrome/browser/extensions/external_pref_loader.h"
 
 #include "base/bind.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 54 matching lines @@
   } while (true);
 
   return external_extension_paths;
 }
 
 // Extracts extension information from a json file serialized by |serializer|.
 // |path| is only used for informational purposes (outputted when an error
 // occurs). An empty dictionary is returned in case of failure (e.g. invalid
 // path or json content).
 // Caller takes ownership of the returned dictionary.
+// TODO(Olli Raula) Make return scoped_ptr
 base::DictionaryValue* ExtractExtensionPrefs(
     base::ValueDeserializer* deserializer,
     const base::FilePath& path) {
   std::string error_msg;
-  base::Value* extensions = deserializer->Deserialize(NULL, &error_msg);
+  scoped_ptr<base::Value> extensions =
+      deserializer->Deserialize(NULL, &error_msg);
   if (!extensions) {
     LOG(WARNING) << "Unable to deserialize json data: " << error_msg
                  << " in file " << path.value() << ".";
     return new base::DictionaryValue;
   }
 
-  base::DictionaryValue* ext_dictionary = NULL;
-  if (extensions->GetAsDictionary(&ext_dictionary))
-    return ext_dictionary;
+  scoped_ptr<base::DictionaryValue> ext_dictionary =
+      base::DictionaryValue::From(extensions.Pass());
+  if (ext_dictionary) {
+    return ext_dictionary.release();
+  }
 
   LOG(WARNING) << "Expected a JSON dictionary in file "
                << path.value() << ".";
   return new base::DictionaryValue;
 }
 
 }  // namespace
 
 namespace extensions {
 
@@ skipping 225 matching lines @@
   LoadFinished();
 }
 
 ExternalTestingLoader::~ExternalTestingLoader() {}
 
 const base::FilePath ExternalTestingLoader::GetBaseCrxFilePath() {
   return fake_base_path_;
 }
 
 }  // namespace extensions