Fix memory leaks in chrome/browser/chromeos/extensions/default_app_order.cc

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 41 matching lines @@
     "gdijeikdkaembjbdobgfkoidjkpbmlkd",  // Play Movies & TV
     "fobcpibfeplaikcclojfdhfdmbbeofai",  // Games
     "joodangkbfjnajiiifokapkpmhfnpleo",  // Calculator
     "hfhhnacclhffhdffklopdkcgdhifgngh",  // Camera
     "gbchcmhmhahfdphkhkmpfmihenigjmpp",  // Chrome Remote Desktop
 };
 
 // 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) {
+scoped_ptr<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).release();
+  scoped_ptr<base::Value> value = deserializer.Deserialize(NULL, &error_msg);
   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;
+  scoped_ptr<base::ListValue> ordinal_list_value =
+      base::ListValue::From(value.Pass());
+  if (!ordinal_list_value)
+    LOG(WARNING) << "Expect a JSON list in file " << path.value();
 
-  LOG(WARNING) << "Expect a JSON list in file " << path.value();
-  // TODO(Olli Raula) possible memory leak http://crbug.com/543015
-  return NULL;
+  return ordinal_list_value;
 }
 
 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))
     return std::string();
@@ skipping 53 matching lines @@
 const std::string& ExternalLoader::GetOemAppsFolderName() {
   if (!loaded_.IsSignaled())
     LOG(ERROR) << "GetOemAppsFolderName() called before loaded.";
   return oem_apps_folder_name_;
 }
 
 void ExternalLoader::Load() {
   base::FilePath ordinals_file;
   CHECK(PathService::Get(chromeos::FILE_DEFAULT_APP_ORDER, &ordinals_file));
 
-  scoped_ptr<base::ListValue> ordinals_value(
-      ReadExternalOrdinalFile(ordinals_file));
+  scoped_ptr<base::ListValue> ordinals_value =
+      ReadExternalOrdinalFile(ordinals_file);
   if (ordinals_value) {
     std::string locale = g_browser_process->GetApplicationLocale();
     for (size_t i = 0; i < ordinals_value->GetSize(); ++i) {
       std::string app_id;
       base::DictionaryValue* dict = NULL;
       if (ordinals_value->GetString(i, &app_id)) {
         app_ids_.push_back(app_id);
       } else if (ordinals_value->GetDictionary(i, &dict)) {
         bool flag = false;
         if (dict->GetBoolean(kOemAppsFolderAttr, &flag) && flag) {
@@ skipping 28 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