Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode.

third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainerTest.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/ServiceWorkerContainer.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/ScriptFunction.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8DOMException.h"
 #include "bindings/core/v8/V8GCController.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/page/FocusController.h"
 #include "core/testing/DummyPageHolder.h"
 #include "modules/serviceworkers/ServiceWorkerContainerClient.h"
 #include "platform/weborigin/KURL.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerClientsInfo.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerProvider.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/text/WTFString.h"
 #include <memory>
+#include <utility>
 #include <v8.h>
 
 namespace blink {
 namespace {
 
 // Promise-related test support.
 
 struct StubScriptFunction {
  public:
   StubScriptFunction() : m_callCount(0) {}
@@ skipping 80 matching lines @@
 
 // Service Worker-specific tests.
 
 class NotReachedWebServiceWorkerProvider : public WebServiceWorkerProvider {
  public:
   ~NotReachedWebServiceWorkerProvider() override {}
 
   void registerServiceWorker(
       const WebURL& pattern,
       const WebURL& scriptURL,
-      WebServiceWorkerRegistrationCallbacks* callbacks) override {
+      std::unique_ptr<WebServiceWorkerRegistrationCallbacks> callbacks)
+      override {
     ADD_FAILURE()
         << "the provider should not be called to register a Service Worker";
-    delete callbacks;
   }
 
   bool validateScopeAndScriptURL(const WebURL& scope,
                                  const WebURL& scriptURL,
                                  WebString* errorMessage) {
     return true;
   }
 };
 
 class ServiceWorkerContainerTest : public ::testing::Test {
@@ skipping 134 matching lines @@
   class WebServiceWorkerProviderImpl : public WebServiceWorkerProvider {
    public:
     WebServiceWorkerProviderImpl(StubWebServiceWorkerProvider& owner)
         : m_owner(owner) {}
 
     ~WebServiceWorkerProviderImpl() override {}
 
     void registerServiceWorker(
         const WebURL& pattern,
         const WebURL& scriptURL,
-        WebServiceWorkerRegistrationCallbacks* callbacks) override {
+        std::unique_ptr<WebServiceWorkerRegistrationCallbacks> callbacks)
+        override {
       m_owner.m_registerCallCount++;
       m_owner.m_registerScope = pattern;
       m_owner.m_registerScriptURL = scriptURL;
-      m_registrationCallbacksToDelete.append(wrapUnique(callbacks));
+      m_registrationCallbacksToDelete.append(std::move(callbacks));
     }
 
     void getRegistration(
         const WebURL& documentURL,
-        WebServiceWorkerGetRegistrationCallbacks* callbacks) override {
+        std::unique_ptr<WebServiceWorkerGetRegistrationCallbacks> callbacks)
+        override {
       m_owner.m_getRegistrationCallCount++;
       m_owner.m_getRegistrationURL = documentURL;
-      m_getRegistrationCallbacksToDelete.append(wrapUnique(callbacks));
+      m_getRegistrationCallbacksToDelete.append(std::move(callbacks));
     }
 
     bool validateScopeAndScriptURL(const WebURL& scope,
                                    const WebURL& scriptURL,
                                    WebString* errorMessage) {
       return true;
     }
 
    private:
     StubWebServiceWorkerProvider& m_owner;
@@ skipping 51 matching lines @@
     ScriptState::Scope scriptScope(getScriptState());
     container->getRegistration(getScriptState(), "");
     EXPECT_EQ(1ul, stubProvider.getRegistrationCallCount());
     EXPECT_EQ(WebURL(KURL(KURL(), "http://localhost/x/index.html")),
               stubProvider.getRegistrationURL());
   }
 }
 
 }  // namespace
 }  // namespace blink