Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/modules/cachestorage/CacheStorage.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/cachestorage/CacheStorage.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "modules/cachestorage/CacheStorageError.h"
 #include "modules/fetch/Request.h"
 #include "modules/fetch/Response.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerCacheError.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerCacheStorage.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
 
 namespace blink {
 
 namespace {
 
 DOMException* createNoImplementationException()
 {
     return DOMException::create(NotSupportedError, "No CacheStorage implementation provided.");
 }
 
@@ skipping 60 matching lines @@
     WTF_MAKE_NONCOPYABLE(WithCacheCallbacks);
 public:
     WithCacheCallbacks(const String& cacheName, CacheStorage* cacheStorage, ScriptPromiseResolver* resolver)
         : m_cacheName(cacheName), m_cacheStorage(cacheStorage), m_resolver(resolver) { }
     ~WithCacheCallbacks() override { }
 
     void onSuccess(std::unique_ptr<WebServiceWorkerCache> webCache) override
     {
         if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
             return;
-        Cache* cache = Cache::create(m_cacheStorage->m_scopedFetcher, wrapUnique(webCache.release()));
+        Cache* cache = Cache::create(m_cacheStorage->m_scopedFetcher, adoptPtr(webCache.release()));
         m_cacheStorage->m_nameToCacheMap.set(m_cacheName, cache);
         m_resolver->resolve(cache);
         m_resolver.clear();
     }
 
     void onError(WebServiceWorkerCacheError reason) override
     {
         if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
             return;
         if (reason == WebServiceWorkerCacheErrorNotFound)
@@ skipping 100 matching lines @@
         m_resolver->reject(CacheStorageError::createException(reason));
         m_resolver.clear();
     }
 
 private:
     Persistent<ScriptPromiseResolver> m_resolver;
 };
 
 CacheStorage* CacheStorage::create(GlobalFetch::ScopedFetcher* fetcher, WebServiceWorkerCacheStorage* webCacheStorage)
 {
-    return new CacheStorage(fetcher, wrapUnique(webCacheStorage));
+    return new CacheStorage(fetcher, adoptPtr(webCacheStorage));
 }
 
 ScriptPromise CacheStorage::open(ScriptState* scriptState, const String& cacheName, ExceptionState& exceptionState)
 {
     if (!commonChecks(scriptState, exceptionState))
         return ScriptPromise();
 
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     const ScriptPromise promise = resolver->promise();
 
@@ skipping 88 matching lines @@
     const ScriptPromise promise = resolver->promise();
 
     if (m_webCacheStorage)
         m_webCacheStorage->dispatchMatch(new MatchCallbacks(resolver), webRequest, Cache::toWebQueryParams(options));
     else
         resolver->reject(createNoImplementationException());
 
     return promise;
 }
 
-CacheStorage::CacheStorage(GlobalFetch::ScopedFetcher* fetcher, std::unique_ptr<WebServiceWorkerCacheStorage> webCacheStorage)
+CacheStorage::CacheStorage(GlobalFetch::ScopedFetcher* fetcher, PassOwnPtr<WebServiceWorkerCacheStorage> webCacheStorage)
     : m_scopedFetcher(fetcher)
     , m_webCacheStorage(std::move(webCacheStorage))
 {
 }
 
 CacheStorage::~CacheStorage()
 {
 }
 
 void CacheStorage::dispose()
 {
     m_webCacheStorage.reset();
 }
 
 DEFINE_TRACE(CacheStorage)
 {
     visitor->trace(m_scopedFetcher);
     visitor->trace(m_nameToCacheMap);
 }
 
 } // namespace blink