Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode.

content/child/quota_dispatcher.cc

 // Copyright (c) 2011 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/quota_dispatcher.h"
 
+#include <memory>
+#include <utility>
+
 #include "base/lazy_instance.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/threading/thread_local.h"
 #include "content/child/quota_message_filter.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/common/quota_messages.h"
 #include "third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h"
 #include "third_party/WebKit/public/platform/WebStorageQuotaType.h"
 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
 #include "url/gurl.h"
 
 using blink::WebStorageQuotaCallbacks;
@@ skipping 82 matching lines @@
                         DidQueryStorageUsageAndQuota);
     IPC_MESSAGE_HANDLER(QuotaMsg_DidFail, DidFail);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   DCHECK(handled) << "Unhandled message:" << msg.type();
 }
 
 void QuotaDispatcher::QueryStorageUsageAndQuota(
     const GURL& origin_url,
     StorageType type,
-    Callback* callback) {
+    std::unique_ptr<Callback> callback) {
   DCHECK(callback);
   int request_id = quota_message_filter_->GenerateRequestID(CurrentWorkerId());
-  pending_quota_callbacks_.AddWithID(callback, request_id);
+  pending_quota_callbacks_.AddWithID(std::move(callback), request_id);
   thread_safe_sender_->Send(new QuotaHostMsg_QueryStorageUsageAndQuota(
       request_id, origin_url, type));
 }
 
 void QuotaDispatcher::RequestStorageQuota(int render_view_id,
                                           const GURL& origin_url,
                                           StorageType type,
                                           uint64_t requested_size,
-                                          Callback* callback) {
+                                          std::unique_ptr<Callback> callback) {
   DCHECK(callback);
   DCHECK(CurrentWorkerId() == 0);
   int request_id = quota_message_filter_->GenerateRequestID(CurrentWorkerId());
-  pending_quota_callbacks_.AddWithID(callback, request_id);
+  pending_quota_callbacks_.AddWithID(std::move(callback), request_id);
 
   StorageQuotaParams params;
   params.render_view_id = render_view_id;
   params.request_id = request_id;
   params.origin_url = origin_url;
   params.storage_type = type;
   params.requested_size = requested_size;
   params.user_gesture =
       blink::WebUserGestureIndicator::isProcessingUserGesture();
   thread_safe_sender_->Send(new QuotaHostMsg_RequestStorageQuota(params));
 }
 
 // static
-QuotaDispatcher::Callback*
+std::unique_ptr<QuotaDispatcher::Callback>
 QuotaDispatcher::CreateWebStorageQuotaCallbacksWrapper(
     blink::WebStorageQuotaCallbacks callbacks) {
-  return new WebStorageQuotaDispatcherCallback(callbacks);
+  return base::MakeUnique<WebStorageQuotaDispatcherCallback>(callbacks);
 }
 
 void QuotaDispatcher::DidGrantStorageQuota(int request_id,
                                            int64_t current_usage,
                                            int64_t granted_quota) {
   Callback* callback = pending_quota_callbacks_.Lookup(request_id);
   DCHECK(callback);
   callback->DidGrantStorageQuota(current_usage, granted_quota);
   pending_quota_callbacks_.Remove(request_id);
 }
@@ skipping 24 matching lines @@
               "mismatching enums: kStorageTypePersistent");
 
 static_assert(int(blink::WebStorageQuotaErrorNotSupported) ==
                   int(storage::kQuotaErrorNotSupported),
               "mismatching enums: kQuotaErrorNotSupported");
 static_assert(int(blink::WebStorageQuotaErrorAbort) ==
                   int(storage::kQuotaErrorAbort),
               "mismatching enums: kQuotaErrorAbort");
 
 }  // namespace content