Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode.

third_party/WebKit/public/web/modules/serviceworker/WebServiceWorkerContextClient.h

 /*
  * Copyright (C) 2013 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 20 matching lines @@
 #ifndef WebServiceWorkerContextClient_h
 #define WebServiceWorkerContextClient_h
 
 #include "public/platform/WebMessagePortChannel.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerClientsClaimCallbacks.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerClientsInfo.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerEventResult.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerSkipWaitingCallbacks.h"
 #include "public/web/WebDevToolsAgentClient.h"
+#include <memory>
+#include <utility>

[danakj, 2016/11/30 00:34:01]

same

 #include <v8.h>
 
 namespace blink {
 
 struct WebCrossOriginServiceWorkerClient;
 struct WebServiceWorkerClientQueryOptions;
 class WebDataSource;
 class WebServiceWorkerContextProxy;
 class WebServiceWorkerNetworkProvider;
 class WebServiceWorkerProvider;
@@ skipping 149 matching lines @@
   // This is called on the main thread.
   virtual WebServiceWorkerProvider* createServiceWorkerProvider() {
     return nullptr;
   }
 
   // Ownership of the passed callbacks is transferred to the callee, callee
   // should delete the callbacks after calling either onSuccess or onError.
   // WebServiceWorkerClientInfo and WebServiceWorkerError ownerships are
   // passed to the WebServiceWorkerClientCallbacks implementation.
   virtual void getClient(const WebString&,
-                         WebServiceWorkerClientCallbacks*) = 0;
+                         std::unique_ptr<WebServiceWorkerClientCallbacks>) = 0;
 
   // Ownership of the passed callbacks is transferred to the callee, callee
   // should delete the callbacks after calling either onSuccess or onError.
   // WebServiceWorkerClientsInfo and WebServiceWorkerError ownerships are
   // passed to the WebServiceWorkerClientsCallbacks implementation.
-  virtual void getClients(const WebServiceWorkerClientQueryOptions&,
-                          WebServiceWorkerClientsCallbacks*) = 0;
+  virtual void getClients(
+      const WebServiceWorkerClientQueryOptions&,
+      std::unique_ptr<WebServiceWorkerClientsCallbacks>) = 0;
 
   // Ownership of the passed callbacks is transferred to the callee, callee
   // should delete the callbacks after calling either onSuccess or onError.
   // WebServiceWorkerClientInfo and WebServiceWorkerError ownerships are
   // passed to the WebServiceWorkerClientsCallbacks implementation.
-  virtual void openWindow(const WebURL&, WebServiceWorkerClientCallbacks*) = 0;
+  virtual void openWindow(const WebURL&,
+                          std::unique_ptr<WebServiceWorkerClientCallbacks>) = 0;
 
   // A suggestion to cache this metadata in association with this URL.
   virtual void setCachedMetadata(const WebURL& url,
                                  const char* data,
                                  size_t size) {}
 
   // A suggestion to clear the cached metadata in association with this URL.
   virtual void clearCachedMetadata(const WebURL& url) {}
 
   // Callee receives ownership of the passed vector.
   // FIXME: Blob refs should be passed to maintain ref counts. crbug.com/351753
   virtual void postMessageToClient(const WebString& uuid,
                                    const WebString&,
                                    WebMessagePortChannelArray*) = 0;
 
   // Callee receives ownership of the passed vector.
   // FIXME: Blob refs should be passed to maintain ref counts. crbug.com/351753
   virtual void postMessageToCrossOriginClient(
       const WebCrossOriginServiceWorkerClient&,
       const WebString&,
       WebMessagePortChannelArray*) = 0;
 
   // Ownership of the passed callbacks is transferred to the callee, callee
   // should delete the callbacks after run.
-  virtual void skipWaiting(WebServiceWorkerSkipWaitingCallbacks*) = 0;
+  virtual void skipWaiting(
+      std::unique_ptr<WebServiceWorkerSkipWaitingCallbacks>) = 0;
 
   // Ownership of the passed callbacks is transferred to the callee, callee
   // should delete the callbacks after run.
-  virtual void claim(WebServiceWorkerClientsClaimCallbacks*) = 0;
+  virtual void claim(
+      std::unique_ptr<WebServiceWorkerClientsClaimCallbacks>) = 0;
 
   // Ownership of the passed callbacks is transferred to the callee, callee
   // should delete the callback after calling either onSuccess or onError.
   virtual void focus(const WebString& uuid,
-                     WebServiceWorkerClientCallbacks*) = 0;
+                     std::unique_ptr<WebServiceWorkerClientCallbacks>) = 0;
 
   // Ownership of the passed callbacks is transferred to the callee, callee
   // should delete the callbacks after calling either onSuccess or onError.
   // WebServiceWorkerClientInfo and WebServiceWorkerError ownerships are
   // passed to the WebServiceWorkerClientsCallbacks implementation.
   virtual void navigate(const WebString& uuid,
                         const WebURL&,
-                        WebServiceWorkerClientCallbacks*) = 0;
+                        std::unique_ptr<WebServiceWorkerClientCallbacks>) = 0;
 
   // Called when the worker wants to register subscopes to handle via foreign
   // fetch. Will only be called while an install event is in progress.
   virtual void registerForeignFetchScopes(
       const WebVector<WebURL>& subScopes,
       const WebVector<WebSecurityOrigin>& origins) = 0;
 };
 
 }  // namespace blink
 
 #endif  // WebServiceWorkerContextClient_h