Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode.

content/child/fileapi/file_system_dispatcher.cc

Index: content/child/fileapi/file_system_dispatcher.cc
diff --git a/content/child/fileapi/file_system_dispatcher.cc b/content/child/fileapi/file_system_dispatcher.cc
index 1fdf49527306648e2070be452c1b961c78af0f5f..ebc1c316461725268d1533a7c1b558b1b15aba43 100644
--- a/content/child/fileapi/file_system_dispatcher.cc
+++ b/content/child/fileapi/file_system_dispatcher.cc
@@ -4,6 +4,8 @@
 
 #include "content/child/fileapi/file_system_dispatcher.h"
 
+#include <memory>
+
 #include "base/callback.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
@@ -25,50 +27,64 @@ class FileSystemDispatcher::CallbackDispatcher {
   typedef FileSystemDispatcher::WriteCallback WriteCallback;
   typedef FileSystemDispatcher::OpenFileCallback OpenFileCallback;
 
-  static CallbackDispatcher* Create(const StatusCallback& callback) {
-    CallbackDispatcher* dispatcher = new CallbackDispatcher;
+  static std::unique_ptr<CallbackDispatcher> Create(
+      const StatusCallback& callback) {
+    std::unique_ptr<CallbackDispatcher> dispatcher =

[danakj, 2016/11/30 00:34:00]

can auto

+        base::WrapUnique(new CallbackDispatcher);

[danakj, 2016/11/30 00:34:00]

makeunique

     dispatcher->status_callback_ = callback;
     dispatcher->error_callback_ = callback;
     return dispatcher;
   }
-  static CallbackDispatcher* Create(const MetadataCallback& callback,
-                                    const StatusCallback& error_callback) {
-    CallbackDispatcher* dispatcher = new CallbackDispatcher;
+  static std::unique_ptr<CallbackDispatcher> Create(
+      const MetadataCallback& callback,
+      const StatusCallback& error_callback) {
+    std::unique_ptr<CallbackDispatcher> dispatcher =

[danakj, 2016/11/30 00:34:00]

same and same throughout

+        base::WrapUnique(new CallbackDispatcher);
     dispatcher->metadata_callback_ = callback;
     dispatcher->error_callback_ = error_callback;
     return dispatcher;
   }
-  static CallbackDispatcher* Create(const CreateSnapshotFileCallback& callback,
-                                    const StatusCallback& error_callback) {
-    CallbackDispatcher* dispatcher = new CallbackDispatcher;
+  static std::unique_ptr<CallbackDispatcher> Create(
+      const CreateSnapshotFileCallback& callback,
+      const StatusCallback& error_callback) {
+    std::unique_ptr<CallbackDispatcher> dispatcher =
+        base::WrapUnique(new CallbackDispatcher);
     dispatcher->snapshot_callback_ = callback;
     dispatcher->error_callback_ = error_callback;
     return dispatcher;
   }
-  static CallbackDispatcher* Create(const ReadDirectoryCallback& callback,
-                                    const StatusCallback& error_callback) {
-    CallbackDispatcher* dispatcher = new CallbackDispatcher;
+  static std::unique_ptr<CallbackDispatcher> Create(
+      const ReadDirectoryCallback& callback,
+      const StatusCallback& error_callback) {
+    std::unique_ptr<CallbackDispatcher> dispatcher =
+        base::WrapUnique(new CallbackDispatcher);
     dispatcher->directory_callback_ = callback;
     dispatcher->error_callback_ = error_callback;
     return dispatcher;
   }
-  static CallbackDispatcher* Create(const OpenFileSystemCallback& callback,
-                                    const StatusCallback& error_callback) {
-    CallbackDispatcher* dispatcher = new CallbackDispatcher;
+  static std::unique_ptr<CallbackDispatcher> Create(
+      const OpenFileSystemCallback& callback,
+      const StatusCallback& error_callback) {
+    std::unique_ptr<CallbackDispatcher> dispatcher =
+        base::WrapUnique(new CallbackDispatcher);
     dispatcher->filesystem_callback_ = callback;
     dispatcher->error_callback_ = error_callback;
     return dispatcher;
   }
-  static CallbackDispatcher* Create(const ResolveURLCallback& callback,
-                                    const StatusCallback& error_callback) {
-    CallbackDispatcher* dispatcher = new CallbackDispatcher;
+  static std::unique_ptr<CallbackDispatcher> Create(
+      const ResolveURLCallback& callback,
+      const StatusCallback& error_callback) {
+    std::unique_ptr<CallbackDispatcher> dispatcher =
+        base::WrapUnique(new CallbackDispatcher);
     dispatcher->resolve_callback_ = callback;
     dispatcher->error_callback_ = error_callback;
     return dispatcher;
   }
-  static CallbackDispatcher* Create(const WriteCallback& callback,
-                                    const StatusCallback& error_callback) {
-    CallbackDispatcher* dispatcher = new CallbackDispatcher;
+  static std::unique_ptr<CallbackDispatcher> Create(
+      const WriteCallback& callback,
+      const StatusCallback& error_callback) {
+    std::unique_ptr<CallbackDispatcher> dispatcher =
+        base::WrapUnique(new CallbackDispatcher);
     dispatcher->write_callback_ = callback;
     dispatcher->error_callback_ = error_callback;
     return dispatcher;