Re-write many calls to WrapUnique() with MakeUnique()

content/browser/plugin_private_storage_helper.cc

 // Copyright 2016 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 "content/browser/plugin_private_storage_helper.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 124 matching lines @@
   if (result != base::File::FILE_OK) {
     DecrementTaskCount();
     return;
   }
 
   storage::AsyncFileUtil* file_util = filesystem_context_->GetAsyncFileUtil(
       storage::kFileSystemTypePluginPrivate);
   std::string root = storage::GetIsolatedFileSystemRootURIString(
       origin_, fsid_, ppapi::kPluginPrivateRootName);
   std::unique_ptr<storage::FileSystemOperationContext> operation_context =
-      base::WrapUnique(
-          new storage::FileSystemOperationContext(filesystem_context_));
+      base::MakeUnique<storage::FileSystemOperationContext>(
+          filesystem_context_);
   file_util->ReadDirectory(
       std::move(operation_context), filesystem_context_->CrackURL(GURL(root)),
       base::Bind(&PluginPrivateDataByOriginChecker::OnDirectoryRead,
                  base::Unretained(this), root));
 }
 
 void PluginPrivateDataByOriginChecker::OnDirectoryRead(
     const std::string& root,
     base::File::Error result,
     const storage::AsyncFileUtil::EntryList& file_list,
@@ skipping 13 matching lines @@
   // No error, process the files returned. No need to do this if we have
   // already decided to delete all the data for this origin.
   if (!delete_this_origin_data_) {
     storage::AsyncFileUtil* file_util = filesystem_context_->GetAsyncFileUtil(
         storage::kFileSystemTypePluginPrivate);
     for (const auto& file : file_list) {
       DVLOG(3) << __func__ << " file: " << file.name;
       DCHECK(!file.is_directory);  // Nested directories not implemented.
 
       std::unique_ptr<storage::FileSystemOperationContext> operation_context =
-          base::WrapUnique(
-              new storage::FileSystemOperationContext(filesystem_context_));
+          base::MakeUnique<storage::FileSystemOperationContext>(
+              filesystem_context_);
       storage::FileSystemURL file_url = filesystem_context_->CrackURL(
           GURL(root + StringTypeToString(file.name)));
       IncrementTaskCount();
       file_util->GetFileInfo(
           std::move(operation_context), file_url,
           storage::FileSystemOperation::GET_METADATA_FIELD_SIZE |
               storage::FileSystemOperation::GET_METADATA_FIELD_LAST_MODIFIED,
           base::Bind(&PluginPrivateDataByOriginChecker::OnFileInfo,
                      base::Unretained(this), StringTypeToString(file.name)));
     }
@@ skipping 214 matching lines @@
     origins.insert(storage_origin);
   }
 
   PluginPrivateDataDeletionHelper* helper = new PluginPrivateDataDeletionHelper(
       std::move(filesystem_context), begin, end, callback);
   helper->CheckOriginsOnFileTaskRunner(origins);
   // |helper| will delete itself when all origins have been checked.
 }
 
 }  // namespace content