Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode.

third_party/WebKit/Source/web/ServiceWorkerGlobalScopeClientImpl.cpp

 /*
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "web/ServiceWorkerGlobalScopeClientImpl.h"
 
 #include "modules/fetch/Response.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerResponse.h"
 #include "public/web/modules/serviceworker/WebServiceWorkerContextClient.h"
 #include <memory>
+#include <utility>
 
 namespace blink {
 
 ServiceWorkerGlobalScopeClient* ServiceWorkerGlobalScopeClientImpl::create(
     WebServiceWorkerContextClient& client) {
   return new ServiceWorkerGlobalScopeClientImpl(client);
 }
 
 ServiceWorkerGlobalScopeClientImpl::~ServiceWorkerGlobalScopeClientImpl() {}
 
 void ServiceWorkerGlobalScopeClientImpl::getClient(
     const WebString& id,
-    WebServiceWorkerClientCallbacks* callbacks) {
-  m_client.getClient(id, callbacks);
+    std::unique_ptr<WebServiceWorkerClientCallbacks> callbacks) {
+  m_client.getClient(id, std::move(callbacks));
 }
 
 void ServiceWorkerGlobalScopeClientImpl::getClients(
     const WebServiceWorkerClientQueryOptions& options,
-    WebServiceWorkerClientsCallbacks* callbacks) {
-  m_client.getClients(options, callbacks);
+    std::unique_ptr<WebServiceWorkerClientsCallbacks> callbacks) {
+  m_client.getClients(options, std::move(callbacks));
 }
 
 void ServiceWorkerGlobalScopeClientImpl::openWindow(
     const WebURL& url,
-    WebServiceWorkerClientCallbacks* callbacks) {
-  m_client.openWindow(url, callbacks);
+    std::unique_ptr<WebServiceWorkerClientCallbacks> callbacks) {
+  m_client.openWindow(url, std::move(callbacks));
 }
 
 void ServiceWorkerGlobalScopeClientImpl::setCachedMetadata(const WebURL& url,
                                                            const char* data,
                                                            size_t size) {
   m_client.setCachedMetadata(url, data, size);
 }
 
 void ServiceWorkerGlobalScopeClientImpl::clearCachedMetadata(
     const WebURL& url) {
@@ skipping 82 matching lines @@
 
 void ServiceWorkerGlobalScopeClientImpl::postMessageToCrossOriginClient(
     const WebCrossOriginServiceWorkerClient& client,
     const WebString& message,
     std::unique_ptr<WebMessagePortChannelArray> webChannels) {
   m_client.postMessageToCrossOriginClient(client, message,
                                           webChannels.release());
 }
 
 void ServiceWorkerGlobalScopeClientImpl::skipWaiting(
-    WebServiceWorkerSkipWaitingCallbacks* callbacks) {
-  m_client.skipWaiting(callbacks);
+    std::unique_ptr<WebServiceWorkerSkipWaitingCallbacks> callbacks) {
+  m_client.skipWaiting(std::move(callbacks));
 }
 
 void ServiceWorkerGlobalScopeClientImpl::claim(
-    WebServiceWorkerClientsClaimCallbacks* callbacks) {
-  m_client.claim(callbacks);
+    std::unique_ptr<WebServiceWorkerClientsClaimCallbacks> callbacks) {
+  m_client.claim(std::move(callbacks));
 }
 
 void ServiceWorkerGlobalScopeClientImpl::focus(
     const WebString& clientUUID,
-    WebServiceWorkerClientCallbacks* callback) {
-  m_client.focus(clientUUID, callback);
+    std::unique_ptr<WebServiceWorkerClientCallbacks> callback) {
+  m_client.focus(clientUUID, std::move(callback));
 }
 
 void ServiceWorkerGlobalScopeClientImpl::navigate(
     const WebString& clientUUID,
     const WebURL& url,
-    WebServiceWorkerClientCallbacks* callback) {
-  m_client.navigate(clientUUID, url, callback);
+    std::unique_ptr<WebServiceWorkerClientCallbacks> callback) {
+  m_client.navigate(clientUUID, url, std::move(callback));
 }
 
 void ServiceWorkerGlobalScopeClientImpl::registerForeignFetchScopes(
     const WebVector<WebURL>& subScopes,
     const WebVector<WebSecurityOrigin>& origins) {
   m_client.registerForeignFetchScopes(subScopes, origins);
 }
 
 ServiceWorkerGlobalScopeClientImpl::ServiceWorkerGlobalScopeClientImpl(
     WebServiceWorkerContextClient& client)
     : m_client(client) {}
 
 }  // namespace blink