Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode.

third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerClients.cpp

 // Copyright 2014 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 "modules/serviceworkers/ServiceWorkerClients.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerLocation.h"
 #include "modules/serviceworkers/ServiceWorkerError.h"
 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h"
 #include "modules/serviceworkers/ServiceWorkerWindowClient.h"
 #include "modules/serviceworkers/ServiceWorkerWindowClientCallback.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerClientQueryOptions.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerClientsInfo.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 #include <memory>
+#include <utility>
 
 namespace blink {
 
 namespace {
 
 class ClientArray {
  public:
   using WebType = const WebServiceWorkerClientsInfo&;
   static HeapVector<Member<ServiceWorkerClient>> take(
       ScriptPromiseResolver*,
@@ skipping 74 matching lines @@
   ExecutionContext* executionContext = scriptState->getExecutionContext();
   // TODO(jungkees): May be null due to worker termination:
   // http://crbug.com/413518.
   if (!executionContext)
     return ScriptPromise();
 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
   ScriptPromise promise = resolver->promise();
 
   ServiceWorkerGlobalScopeClient::from(executionContext)
-      ->getClient(id, new GetCallback(resolver));
+      ->getClient(id, WTF::makeUnique<GetCallback>(resolver));
   return promise;
 }
 
 ScriptPromise ServiceWorkerClients::matchAll(
     ScriptState* scriptState,
     const ClientQueryOptions& options) {
   ExecutionContext* executionContext = scriptState->getExecutionContext();
   // FIXME: May be null due to worker termination: http://crbug.com/413518.
   if (!executionContext)
     return ScriptPromise();
 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
   ScriptPromise promise = resolver->promise();
 
   WebServiceWorkerClientQueryOptions webOptions;
   webOptions.clientType = getClientType(options.type());
   webOptions.includeUncontrolled = options.includeUncontrolled();
   ServiceWorkerGlobalScopeClient::from(executionContext)
       ->getClients(webOptions,
-                   new CallbackPromiseAdapter<ClientArray, ServiceWorkerError>(
+                   WTF::makeUnique<
+                       CallbackPromiseAdapter<ClientArray, ServiceWorkerError>>(
                        resolver));
   return promise;
 }
 
 ScriptPromise ServiceWorkerClients::claim(ScriptState* scriptState) {
   ExecutionContext* executionContext = scriptState->getExecutionContext();
 
   // FIXME: May be null due to worker termination: http://crbug.com/413518.
   if (!executionContext)
     return ScriptPromise();
 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
   ScriptPromise promise = resolver->promise();
 
-  WebServiceWorkerClientsClaimCallbacks* callbacks =
-      new CallbackPromiseAdapter<void, ServiceWorkerError>(resolver);
-  ServiceWorkerGlobalScopeClient::from(executionContext)->claim(callbacks);
+  std::unique_ptr<WebServiceWorkerClientsClaimCallbacks> callbacks =

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

can auto

+      WTF::makeUnique<CallbackPromiseAdapter<void, ServiceWorkerError>>(
+          resolver);
+  ServiceWorkerGlobalScopeClient::from(executionContext)
+      ->claim(std::move(callbacks));
   return promise;
 }
 
 ScriptPromise ServiceWorkerClients::openWindow(ScriptState* scriptState,
                                                const String& url) {
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
   ScriptPromise promise = resolver->promise();
   ExecutionContext* context = scriptState->getExecutionContext();
 
   KURL parsedUrl = KURL(toWorkerGlobalScope(context)->location()->url(), url);
@@ skipping 11 matching lines @@
   }
 
   if (!context->isWindowInteractionAllowed()) {
     resolver->reject(DOMException::create(InvalidAccessError,
                                           "Not allowed to open a window."));
     return promise;
   }
   context->consumeWindowInteraction();
 
   ServiceWorkerGlobalScopeClient::from(context)->openWindow(
-      parsedUrl, new NavigateClientCallback(resolver));
+      parsedUrl, WTF::makeUnique<NavigateClientCallback>(resolver));
   return promise;
 }
 
 }  // namespace blink