Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode.

content/browser/permissions/permission_service_impl.cc

Index: content/browser/permissions/permission_service_impl.cc
diff --git a/content/browser/permissions/permission_service_impl.cc b/content/browser/permissions/permission_service_impl.cc
index ccb70ff5db558f1029b1405c7b9ba84465d5f09b..7c67713020e46bf595b3af4ffb0e2a2ee5c8dc26 100644
--- a/content/browser/permissions/permission_service_impl.cc
+++ b/content/browser/permissions/permission_service_impl.cc
@@ -5,6 +5,8 @@
 #include "content/browser/permissions/permission_service_impl.h"
 
 #include <stddef.h>
+
+#include <memory>

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

should also include base/memory/ptr_util.h in any files that use
base::MakeUnique

[rlanday, 2016/11/30 15:52:01]

Ah, I was going off of the output from "git cl lint" and it didn't flag this...

 #include <utility>
 
 #include "base/bind.h"
@@ -130,8 +132,9 @@ void PermissionServiceImpl::RequestPermission(
     return;
   }
 
-  int pending_request_id = pending_requests_.Add(new PendingRequest(
-      base::Bind(&PermissionRequestResponseCallbackWrapper, callback), 1));
+  int pending_request_id =
+      pending_requests_.Add(base::MakeUnique<PendingRequest>(
+          base::Bind(&PermissionRequestResponseCallbackWrapper, callback), 1));
   int id = browser_context->GetPermissionManager()->RequestPermission(
       PermissionDescriptorToPermissionType(permission),
       context_->render_frame_host(), origin.GetURL(), user_gesture,
@@ -182,7 +185,7 @@ void PermissionServiceImpl::RequestPermissions(
     types[i] = PermissionDescriptorToPermissionType(permissions[i]);
 
   int pending_request_id = pending_requests_.Add(
-      new PendingRequest(callback, permissions.size()));
+      base::MakeUnique<PendingRequest>(callback, permissions.size()));
   int id = browser_context->GetPermissionManager()->RequestPermissions(
       types, context_->render_frame_host(), origin.GetURL(), user_gesture,
       base::Bind(&PermissionServiceImpl::OnRequestPermissionsResponse,
@@ -287,13 +290,15 @@ void PermissionServiceImpl::GetNextPermissionChange(
   // We need to pass the id of PendingSubscription in pending_subscriptions_
   // to the callback but SubscribePermissionStatusChange() will also return an
   // id which is different.
-  PendingSubscription* subscription =
-      new PendingSubscription(permission_type, origin, callback);
-  int pending_subscription_id = pending_subscriptions_.Add(subscription);
+  std::unique_ptr<PendingSubscription> subscription =

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

can auto

+      base::MakeUnique<PendingSubscription>(permission_type, origin, callback);
+  PendingSubscription* subscription_raw = subscription.get();
+  int pending_subscription_id =
+      pending_subscriptions_.Add(std::move(subscription));
 
   GURL requesting_origin(origin.Serialize());
   GURL embedding_origin = context_->GetEmbeddingOrigin();
-  subscription->id =
+  subscription_raw->id =
       browser_context->GetPermissionManager()->SubscribePermissionStatusChange(
           permission_type, requesting_origin,
           // If the embedding_origin is empty, we,ll use the |origin| instead.