Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1424)

Unified Diff: chrome/browser/permissions/permission_manager.cc

Issue 2480293004: Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode. (Closed)
Patch Set: Make changes requested by danakj, fix a few more headers Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/permissions/permission_manager.cc
diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc
index 031d46958541a6651e6c8ce78fe8ba39fa268f72..9925c5a0d237e01c515667c2bb854f34e63dd5de 100644
--- a/chrome/browser/permissions/permission_manager.cc
+++ b/chrome/browser/permissions/permission_manager.cc
@@ -7,6 +7,7 @@
#include <stddef.h>
#include <memory>
+#include <utility>
#include "base/callback.h"
#include "base/memory/ptr_util.h"
@@ -301,9 +302,8 @@ int PermissionManager::RequestPermissions(
content::WebContents::FromRenderFrameHost(render_frame_host);
GURL embedding_origin = web_contents->GetLastCommittedURL().GetOrigin();
- PendingRequest* pending_request = new PendingRequest(
- render_frame_host, permissions, callback);
- int request_id = pending_requests_.Add(pending_request);
+ int request_id = pending_requests_.Add(base::MakeUnique<PendingRequest>(
+ render_frame_host, permissions, callback));
const PermissionRequestID request(render_frame_host, request_id);
@@ -429,7 +429,7 @@ int PermissionManager::SubscribePermissionStatusChange(
if (subscriptions_.IsEmpty())
HostContentSettingsMapFactory::GetForProfile(profile_)->AddObserver(this);
- Subscription* subscription = new Subscription();
+ auto subscription = base::MakeUnique<Subscription>();
subscription->permission = permission;
subscription->requesting_origin = requesting_origin;
subscription->embedding_origin = embedding_origin;
@@ -445,7 +445,7 @@ int PermissionManager::SubscribePermissionStatusChange(
subscription->embedding_origin);
}
- return subscriptions_.Add(subscription);
+ return subscriptions_.Add(std::move(subscription));
}
void PermissionManager::UnsubscribePermissionStatusChange(int subscription_id) {
« no previous file with comments | « chrome/browser/metrics/subprocess_metrics_provider.cc ('k') | chrome/browser/ui/blocked_content/popup_blocker_tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698