Make ValueDeserializer::Deserialize return scoped_ptr

chrome/browser/chromeos/app_mode/kiosk_external_updater.cc

 // Copyright 2014 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/app_mode/kiosk_external_updater.h"
 
 #include "base/bind.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "base/json/json_file_value_serializer.h"
@@ skipping 26 matching lines @@
     KioskExternalUpdater::ExternalUpdateErrorCode* error_code) {
   base::FilePath manifest =
       external_update_dir.AppendASCII(kExternalUpdateManifest);
   if (!base::PathExists(manifest)) {
     *error_code = KioskExternalUpdater::ERROR_NO_MANIFEST;
     return;
   }
 
   JSONFileValueDeserializer deserializer(manifest);
   std::string error_msg;
-  base::Value* extensions = deserializer.Deserialize(NULL, &error_msg);
+  base::Value* extensions =
+      deserializer.Deserialize(NULL, &error_msg).release();
+  // TODO(Olli Raula) possible memoryleak http://crbug.com/543015

[Lei Zhang, 2015/10/14 16:46:14]

memory leak is two words.

   if (!extensions) {
     *error_code = KioskExternalUpdater::ERROR_INVALID_MANIFEST;
     return;
   }
 
   base::DictionaryValue* dict_value = NULL;
   if (!extensions->GetAsDictionary(&dict_value)) {
     *error_code = KioskExternalUpdater::ERROR_INVALID_MANIFEST;
     return;
   }
@@ skipping 466 matching lines @@
   if (failed) {
     failed_app_msg = ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
                          IDS_KIOSK_EXTERNAL_UPDATE_FAILED_UPDATED_APPS) +
                      base::ASCIIToUTF16("\n") + failed_apps;
     message = message + base::ASCIIToUTF16("\n") + failed_app_msg;
   }
   return message;
 }
 
 }  // namespace chromeos