Make ValueDeserializer::Deserialize return scoped_ptr

chrome/browser/chromeos/extensions/default_app_order.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/chromeos/extensions/default_app_order.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 47 matching lines @@
 
 // Reads external ordinal json file and returned the parsed value. Returns NULL
 // if the file does not exist or could not be parsed properly. Caller takes
 // ownership of the returned value.
 base::ListValue* ReadExternalOrdinalFile(const base::FilePath& path) {
   if (!base::PathExists(path))
     return NULL;
 
   JSONFileValueDeserializer deserializer(path);
   std::string error_msg;
-  base::Value* value = deserializer.Deserialize(NULL, &error_msg);
+  base::Value* value = deserializer.Deserialize(NULL, &error_msg).release();
   if (!value) {
     LOG(WARNING) << "Unable to deserialize default app ordinals json data:"
         << error_msg << ", file=" << path.value();
     return NULL;
   }
 
   base::ListValue* ordinal_list_value = NULL;
   if (value->GetAsList(&ordinal_list_value))
     return ordinal_list_value;
 
   LOG(WARNING) << "Expect a JSON list in file " << path.value();
+  // TODO(Olli Raula) possible memory leak http://crbug.com/543015
   return NULL;
 }
 
 std::string GetLocaleSpecificStringImpl(
     const base::DictionaryValue* root,
     const std::string& locale,
     const std::string& dictionary_name,
     const std::string& entry_name) {
   const base::DictionaryValue* dictionary_content = NULL;
   if (!root || !root->GetDictionary(dictionary_name, &dictionary_content))
@@ skipping 104 matching lines @@
 std::string GetOemAppsFolderName() {
   // |loader_instance| could be NULL for test.
   if (!loader_instance)
     return std::string();
   else
     return loader_instance->GetOemAppsFolderName();
 }
 
 }  // namespace default_app_order
 }  // namespace chromeos