| 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..bc88d49431a11033df1a0f022931d964832463c5 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>
|
| #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,
|
| @@ -289,7 +292,8 @@ void PermissionServiceImpl::GetNextPermissionChange(
|
| // id which is different.
|
| PendingSubscription* subscription =
|
| new PendingSubscription(permission_type, origin, callback);
|
| - int pending_subscription_id = pending_subscriptions_.Add(subscription);
|
| + int pending_subscription_id = pending_subscriptions_.Add(
|
| + std::unique_ptr<PendingSubscription>(subscription));
|
|
|
| GURL requesting_origin(origin.Serialize());
|
| GURL embedding_origin = context_->GetEmbeddingOrigin();
|
|
|