Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode.

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

 /*
  * 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 40 matching lines @@
 #include "modules/serviceworkers/ServiceWorkerRegistration.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/weborigin/SchemeRegistry.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/modules/serviceworker/WebServiceWorker.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerProvider.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerRegistration.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
+#include <utility>
 
 namespace blink {
 
 class RegistrationCallback
     : public WebServiceWorkerProvider::WebServiceWorkerRegistrationCallbacks {
  public:
   explicit RegistrationCallback(ScriptPromiseResolver* resolver)
       : m_resolver(resolver) {}
   ~RegistrationCallback() override {}
 
@@ skipping 243 matching lines @@
       callbacks->onError(WebServiceWorkerError(
           WebServiceWorkerError::ErrorTypeSecurity,
           String(
               "Failed to register a ServiceWorker: The provided scriptURL ('" +
               scriptURL.getString() +
               "') violates the Content Security Policy.")));
       return;
     }
   }
 
-  m_provider->registerServiceWorker(patternURL, scriptURL, callbacks.release());
+  m_provider->registerServiceWorker(patternURL, scriptURL,
+                                    std::move(callbacks));
 }
 
 ScriptPromise ServiceWorkerContainer::registerServiceWorker(
     ScriptState* scriptState,
     const String& url,
     const RegistrationOptions& options) {
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
   ScriptPromise promise = resolver->promise();
 
   if (!m_provider) {
@@ skipping 71 matching lines @@
         SecurityOrigin::create(completedURL);
     resolver->reject(
         DOMException::create(SecurityError,
                              "Failed to get a ServiceWorkerRegistration: The "
                              "origin of the provided documentURL ('" +
                                  documentURLOrigin->toString() +
                                  "') does not match the current origin ('" +
                                  documentOrigin->toString() + "')."));
     return promise;
   }
-  m_provider->getRegistration(completedURL,
-                              new GetRegistrationCallback(resolver));
+  m_provider->getRegistration(
+      completedURL, WTF::makeUnique<GetRegistrationCallback>(resolver));
 
   return promise;
 }
 
 ScriptPromise ServiceWorkerContainer::getRegistrations(
     ScriptState* scriptState) {
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
   ScriptPromise promise = resolver->promise();
 
   if (!m_provider) {
@@ skipping 16 matching lines @@
   if (!SchemeRegistry::shouldTreatURLSchemeAsAllowingServiceWorkers(
           pageURL.protocol())) {
     resolver->reject(DOMException::create(
         SecurityError,
         "Failed to get ServiceWorkerRegistration objects: The URL protocol of "
         "the current origin ('" +
             documentOrigin->toString() + "') is not supported."));
     return promise;
   }
 
-  m_provider->getRegistrations(new GetRegistrationsCallback(resolver));
+  m_provider->getRegistrations(
+      WTF::makeUnique<GetRegistrationsCallback>(resolver));
 
   return promise;
 }
 
 ServiceWorkerContainer::ReadyProperty*
 ServiceWorkerContainer::createReadyProperty() {
   return new ReadyProperty(getExecutionContext(), this, ReadyProperty::Ready);
 }
 
 ScriptPromise ServiceWorkerContainer::ready(ScriptState* callerState) {
   if (!getExecutionContext())
     return ScriptPromise();
 
   if (!callerState->world().isMainWorld()) {
     // FIXME: Support .ready from isolated worlds when
     // ScriptPromiseProperty can vend Promises in isolated worlds.
     return ScriptPromise::rejectWithDOMException(
         callerState,
         DOMException::create(NotSupportedError,
                              "'ready' is only supported in pages."));
   }
 
   if (!m_ready) {
     m_ready = createReadyProperty();
-    if (m_provider)
+    if (m_provider) {
       m_provider->getRegistrationForReady(
-          new GetRegistrationForReadyCallback(m_ready.get()));
+          WTF::makeUnique<GetRegistrationForReadyCallback>(m_ready.get()));
+    }
   }
 
   return m_ready->promise(callerState->world());
 }
 
 void ServiceWorkerContainer::setController(
     std::unique_ptr<WebServiceWorker::Handle> handle,
     bool shouldNotifyControllerChange) {
   if (!getExecutionContext())
     return;
@@ skipping 35 matching lines @@
 
   if (ServiceWorkerContainerClient* client =
           ServiceWorkerContainerClient::from(executionContext)) {
     m_provider = client->provider();
     if (m_provider)
       m_provider->setClient(this);
   }
 }
 
 }  // namespace blink