Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode.

content/child/service_worker/web_service_worker_provider_impl.cc

 // Copyright 2013 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/service_worker/web_service_worker_provider_impl.h"
 
+#include <memory>
+#include <utility>
+
 #include "content/child/service_worker/service_worker_dispatcher.h"
 #include "content/child/service_worker/service_worker_handle_reference.h"
 #include "content/child/service_worker/service_worker_provider_context.h"
 #include "content/child/service_worker/web_service_worker_impl.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/common/service_worker/service_worker_utils.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerProviderClient.h"
 
 using blink::WebURL;
@@ skipping 33 matching lines @@
       GetDispatcher()->GetOrCreateServiceWorker(
           ServiceWorkerHandleReference::Create(context_->controller()->info(),
                                                thread_safe_sender_.get()));
   client->setController(WebServiceWorkerImpl::CreateHandle(controller),
                         false /* shouldNotifyControllerChange */);
 }
 
 void WebServiceWorkerProviderImpl::registerServiceWorker(
     const WebURL& pattern,
     const WebURL& script_url,
-    WebServiceWorkerRegistrationCallbacks* callbacks) {
-  GetDispatcher()->RegisterServiceWorker(
-      context_->provider_id(), pattern, script_url, callbacks);
+    std::unique_ptr<WebServiceWorkerRegistrationCallbacks> callbacks) {
+  GetDispatcher()->RegisterServiceWorker(context_->provider_id(), pattern,
+                                         script_url, std::move(callbacks));
 }
 
 void WebServiceWorkerProviderImpl::getRegistration(
     const blink::WebURL& document_url,
-    WebServiceWorkerGetRegistrationCallbacks* callbacks) {
-  GetDispatcher()->GetRegistration(
-      context_->provider_id(), document_url, callbacks);
+    std::unique_ptr<WebServiceWorkerGetRegistrationCallbacks> callbacks) {
+  GetDispatcher()->GetRegistration(context_->provider_id(), document_url,
+                                   std::move(callbacks));
 }
 
 void WebServiceWorkerProviderImpl::getRegistrations(
-    WebServiceWorkerGetRegistrationsCallbacks* callbacks) {
-  GetDispatcher()->GetRegistrations(
-      context_->provider_id(), callbacks);
+    std::unique_ptr<WebServiceWorkerGetRegistrationsCallbacks> callbacks) {
+  GetDispatcher()->GetRegistrations(context_->provider_id(),
+                                    std::move(callbacks));
 }
 
 void WebServiceWorkerProviderImpl::getRegistrationForReady(
-    WebServiceWorkerGetRegistrationForReadyCallbacks* callbacks) {
-  GetDispatcher()->GetRegistrationForReady(context_->provider_id(), callbacks);
+    std::unique_ptr<WebServiceWorkerGetRegistrationForReadyCallbacks>
+        callbacks) {
+  GetDispatcher()->GetRegistrationForReady(context_->provider_id(),
+                                           std::move(callbacks));
 }
 
 bool WebServiceWorkerProviderImpl::validateScopeAndScriptURL(
     const blink::WebURL& scope,
     const blink::WebURL& script_url,
     blink::WebString* error_message) {
   std::string error;
   bool has_error = ServiceWorkerUtils::ContainsDisallowedCharacter(
       scope, script_url, &error);
   if (has_error)
@@ skipping 12 matching lines @@
       ServiceWorkerDispatcher::GetThreadSpecificInstance();
   if (dispatcher)
     dispatcher->RemoveProviderClient(context_->provider_id());
 }
 
 ServiceWorkerDispatcher* WebServiceWorkerProviderImpl::GetDispatcher() {
   return ServiceWorkerDispatcher::GetThreadSpecificInstance();
 }
 
 }  // namespace content