Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode.

content/child/fileapi/file_system_dispatcher.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 "content/child/fileapi/file_system_dispatcher.h"
 
+#include <memory>
+
 #include "base/callback.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/process/process.h"
 #include "content/child/child_thread_impl.h"
 #include "content/common/fileapi/file_system_messages.h"
 #include "storage/common/fileapi/file_system_info.h"
 
 namespace content {
 
@@ skipping 146 matching lines @@
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void FileSystemDispatcher::OpenFileSystem(
     const GURL& origin_url,
     storage::FileSystemType type,
     const OpenFileSystemCallback& success_callback,
     const StatusCallback& error_callback) {
   int request_id = dispatchers_.Add(
-      CallbackDispatcher::Create(success_callback, error_callback));
+      std::unique_ptr<CallbackDispatcher>(

[danakj, 2016/11/18 00:15:33]

can you make the Create methods return unique_ptr? If not, WrapUnique here

[rlanday, 2016/11/18 19:32:10]

We can make the Create methods return unique_ptr, however the constructor is
private, so I think we have to do:

base::WrapUnique(new CallbackDispatcher)

instead of

base::MakeUnique<CallbackDispatcher>()

[danakj, 2016/11/18 21:21:13]

Ya that's fine inside the Create methods.

+          CallbackDispatcher::Create(success_callback, error_callback)));
   ChildThreadImpl::current()->Send(new FileSystemHostMsg_OpenFileSystem(
       request_id, origin_url, type));
 }
 
 void FileSystemDispatcher::ResolveURL(
     const GURL& filesystem_url,
     const ResolveURLCallback& success_callback,
     const StatusCallback& error_callback) {
   int request_id = dispatchers_.Add(
-      CallbackDispatcher::Create(success_callback, error_callback));
+      std::unique_ptr<CallbackDispatcher>(
+          CallbackDispatcher::Create(success_callback, error_callback)));
   ChildThreadImpl::current()->Send(new FileSystemHostMsg_ResolveURL(
           request_id, filesystem_url));
 }
 
 void FileSystemDispatcher::DeleteFileSystem(const GURL& origin_url,
                                             storage::FileSystemType type,
                                             const StatusCallback& callback) {
-  int request_id = dispatchers_.Add(CallbackDispatcher::Create(callback));
+  int request_id = dispatchers_.Add(
+      std::unique_ptr<CallbackDispatcher>(
+          CallbackDispatcher::Create(callback)));
   ChildThreadImpl::current()->Send(new FileSystemHostMsg_DeleteFileSystem(
           request_id, origin_url, type));
 }
 
 void FileSystemDispatcher::Move(
     const GURL& src_path,
     const GURL& dest_path,
     const StatusCallback& callback) {
-  int request_id = dispatchers_.Add(CallbackDispatcher::Create(callback));
+  int request_id = dispatchers_.Add(
+      std::unique_ptr<CallbackDispatcher>(
+          CallbackDispatcher::Create(callback)));
   ChildThreadImpl::current()->Send(new FileSystemHostMsg_Move(
           request_id, src_path, dest_path));
 }
 
 void FileSystemDispatcher::Copy(
     const GURL& src_path,
     const GURL& dest_path,
     const StatusCallback& callback) {
-  int request_id = dispatchers_.Add(CallbackDispatcher::Create(callback));
+  int request_id = dispatchers_.Add(
+      std::unique_ptr<CallbackDispatcher>(
+          CallbackDispatcher::Create(callback)));
   ChildThreadImpl::current()->Send(new FileSystemHostMsg_Copy(
       request_id, src_path, dest_path));
 }
 
 void FileSystemDispatcher::Remove(
     const GURL& path,
     bool recursive,
     const StatusCallback& callback) {
-  int request_id = dispatchers_.Add(CallbackDispatcher::Create(callback));
+  int request_id = dispatchers_.Add(
+      std::unique_ptr<CallbackDispatcher>(
+          CallbackDispatcher::Create(callback)));
   ChildThreadImpl::current()->Send(
       new FileSystemHostMsg_Remove(request_id, path, recursive));
 }
 
 void FileSystemDispatcher::ReadMetadata(
     const GURL& path,
     const MetadataCallback& success_callback,
     const StatusCallback& error_callback) {
   int request_id = dispatchers_.Add(
-      CallbackDispatcher::Create(success_callback, error_callback));
+      std::unique_ptr<CallbackDispatcher>(
+          CallbackDispatcher::Create(success_callback, error_callback)));
   ChildThreadImpl::current()->Send(
       new FileSystemHostMsg_ReadMetadata(request_id, path));
 }
 
 void FileSystemDispatcher::CreateFile(
     const GURL& path,
     bool exclusive,
     const StatusCallback& callback) {
-  int request_id = dispatchers_.Add(CallbackDispatcher::Create(callback));
+  int request_id = dispatchers_.Add(
+      std::unique_ptr<CallbackDispatcher>(
+          CallbackDispatcher::Create(callback)));
   ChildThreadImpl::current()->Send(new FileSystemHostMsg_Create(
       request_id, path, exclusive,
       false /* is_directory */, false /* recursive */));
 }
 
 void FileSystemDispatcher::CreateDirectory(
     const GURL& path,
     bool exclusive,
     bool recursive,
     const StatusCallback& callback) {
-  int request_id = dispatchers_.Add(CallbackDispatcher::Create(callback));
+  int request_id = dispatchers_.Add(
+      std::unique_ptr<CallbackDispatcher>(
+          CallbackDispatcher::Create(callback)));
   ChildThreadImpl::current()->Send(new FileSystemHostMsg_Create(
       request_id, path, exclusive, true /* is_directory */, recursive));
 }
 
 void FileSystemDispatcher::Exists(
     const GURL& path,
     bool is_directory,
     const StatusCallback& callback) {
-  int request_id = dispatchers_.Add(CallbackDispatcher::Create(callback));
+  int request_id = dispatchers_.Add(
+      std::unique_ptr<CallbackDispatcher>(
+          CallbackDispatcher::Create(callback)));
   ChildThreadImpl::current()->Send(
       new FileSystemHostMsg_Exists(request_id, path, is_directory));
 }
 
 void FileSystemDispatcher::ReadDirectory(
     const GURL& path,
     const ReadDirectoryCallback& success_callback,
     const StatusCallback& error_callback) {
   int request_id = dispatchers_.Add(
-      CallbackDispatcher::Create(success_callback, error_callback));
+      std::unique_ptr<CallbackDispatcher>(
+          CallbackDispatcher::Create(success_callback, error_callback)));
   ChildThreadImpl::current()->Send(
       new FileSystemHostMsg_ReadDirectory(request_id, path));
 }
 
 void FileSystemDispatcher::Truncate(const GURL& path,
                                     int64_t offset,
                                     int* request_id_out,
                                     const StatusCallback& callback) {
-  int request_id = dispatchers_.Add(CallbackDispatcher::Create(callback));
+  int request_id = dispatchers_.Add(
+      std::unique_ptr<CallbackDispatcher>(
+          CallbackDispatcher::Create(callback)));
   ChildThreadImpl::current()->Send(
       new FileSystemHostMsg_Truncate(request_id, path, offset));
 
   if (request_id_out)
     *request_id_out = request_id;
 }
 
 void FileSystemDispatcher::Write(const GURL& path,
                                  const std::string& blob_id,
                                  int64_t offset,
                                  int* request_id_out,
                                  const WriteCallback& success_callback,
                                  const StatusCallback& error_callback) {
   int request_id = dispatchers_.Add(
-      CallbackDispatcher::Create(success_callback, error_callback));
+      std::unique_ptr<CallbackDispatcher>(
+          CallbackDispatcher::Create(success_callback, error_callback)));
   ChildThreadImpl::current()->Send(
       new FileSystemHostMsg_Write(request_id, path, blob_id, offset));
 
   if (request_id_out)
     *request_id_out = request_id;
 }
 
 void FileSystemDispatcher::Cancel(
     int request_id_to_cancel,
     const StatusCallback& callback) {
-  int request_id = dispatchers_.Add(CallbackDispatcher::Create(callback));
+  int request_id = dispatchers_.Add(
+      std::unique_ptr<CallbackDispatcher>(
+          CallbackDispatcher::Create(callback)));
   ChildThreadImpl::current()->Send(new FileSystemHostMsg_CancelWrite(
       request_id, request_id_to_cancel));
 }
 
 void FileSystemDispatcher::TouchFile(
     const GURL& path,
     const base::Time& last_access_time,
     const base::Time& last_modified_time,
     const StatusCallback& callback) {
-  int request_id = dispatchers_.Add(CallbackDispatcher::Create(callback));
+  int request_id = dispatchers_.Add(
+      std::unique_ptr<CallbackDispatcher>(
+          CallbackDispatcher::Create(callback)));
   ChildThreadImpl::current()->Send(
       new FileSystemHostMsg_TouchFile(
           request_id, path, last_access_time, last_modified_time));
 }
 
 void FileSystemDispatcher::CreateSnapshotFile(
     const GURL& file_path,
     const CreateSnapshotFileCallback& success_callback,
     const StatusCallback& error_callback) {
   int request_id = dispatchers_.Add(
-      CallbackDispatcher::Create(success_callback, error_callback));
+      std::unique_ptr<CallbackDispatcher>(
+          CallbackDispatcher::Create(success_callback, error_callback)));
   ChildThreadImpl::current()->Send(
       new FileSystemHostMsg_CreateSnapshotFile(
           request_id, file_path));
 }
 
 void FileSystemDispatcher::OnDidOpenFileSystem(int request_id,
                                                const std::string& name,
                                                const GURL& root) {
   DCHECK(root.is_valid());
   CallbackDispatcher* dispatcher = dispatchers_.Lookup(request_id);
@@ skipping 60 matching lines @@
                                       int64_t bytes,
                                       bool complete) {
   CallbackDispatcher* dispatcher = dispatchers_.Lookup(request_id);
   DCHECK(dispatcher);
   dispatcher->DidWrite(bytes, complete);
   if (complete)
     dispatchers_.Remove(request_id);
 }
 
 }  // namespace content