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();
   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;

[Lei Zhang, 2015/10/12 22:42:21]

Sorry to bug you about these possibly existing issues. Feel free to punt / file
bugs. Basically any place where we release(), I get suspicious. :)

I think we need to free |extensions| here?

     return;
   }
 
   parsed_manifest->Swap(dict_value);

[Lei Zhang, 2015/10/12 22:42:21]

After we swap, do we need to free the pointer that got swapped in?

   *error_code = KioskExternalUpdater::ERROR_NONE;
 }
 
 // Copies |external_crx_file| to |temp_crx_file|, and removes |temp_dir|
 // created for unpacking |external_crx_file|.
 void CopyExternalCrxAndDeleteTempDir(const base::FilePath& external_crx_file,
                                      const base::FilePath& temp_crx_file,
                                      const base::FilePath& temp_dir,
                                      bool* success) {
   base::DeleteFile(temp_dir, true);
@@ skipping 454 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