Transfer DictionaryValue ownership in SandboxedUnpacker::OnUnpackSuccess()

extensions/browser/sandboxed_unpacker.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 "extensions/browser/sandboxed_unpacker.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <set>
@@ skipping 666 matching lines @@
     std::unique_ptr<base::DictionaryValue> original_manifest,
     const SkBitmap& install_icon) {
   UMA_HISTOGRAM_COUNTS("Extensions.SandboxUnpackSuccess", 1);
 
   if (!crx_unpack_start_time_.is_null())
     RecordSuccessfulUnpackTimeHistograms(
         crx_path_for_histograms_,
         base::TimeTicks::Now() - crx_unpack_start_time_);
   DCHECK(!temp_dir_.GetPath().empty());
 
   // Client takes ownership of temporary directory and extension.

[Noel Gordon, 2017/03/30 06:35:41]

Maybe this comment needs updating too?  Perhaps:

// Client takes ownership of temporary directory, manifest, and extension.

or similar.

[lazyboy, 2017/03/30 07:01:51]

Done.

-  // TODO(https://crbug.com/699528): we should consider transferring the
-  // ownership of original_manifest to the client as well.
   client_->OnUnpackSuccess(temp_dir_.Take(), extension_root_,
-                           original_manifest.get(), extension_.get(),
+                           std::move(original_manifest), extension_.get(),
                            install_icon);
   extension_ = NULL;
 }
 
 base::DictionaryValue* SandboxedUnpacker::RewriteManifestFile(
     const base::DictionaryValue& manifest) {
   // Add the public key extracted earlier to the parsed manifest and overwrite
   // the original manifest. We do this to ensure the manifest doesn't contain an
   // exploitable bug that could be used to compromise the browser.
   DCHECK(!public_key_.empty());
@@ skipping 204 matching lines @@
 
 void SandboxedUnpacker::Cleanup() {
   DCHECK(unpacker_io_task_runner_->RunsTasksOnCurrentThread());
   if (!temp_dir_.Delete()) {
     LOG(WARNING) << "Can not delete temp directory at "
                  << temp_dir_.GetPath().value();
   }
 }
 
 }  // namespace extensions