DevTools: migrate from OwnPtr to std::unique_ptr for inspector protocol classes.

third_party/WebKit/Source/modules/cachestorage/InspectorCacheStorageAgent.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/InspectorCacheStorageAgent.h"
 #include "platform/heap/Handle.h"
 #include "platform/inspector_protocol/Dispatcher.h"
 #include "platform/inspector_protocol/TypeBuilder.h"
 #include "platform/inspector_protocol/Values.h"
 #include "platform/weborigin/KURL.h"
@@ skipping 95 matching lines @@
         return CString("unknown error.");
         break;
     }
 }
 
 class RequestCacheNames
     : public WebServiceWorkerCacheStorage::CacheStorageKeysCallbacks {
     WTF_MAKE_NONCOPYABLE(RequestCacheNames);
 
 public:
-    RequestCacheNames(const String& securityOrigin, PassOwnPtr<RequestCacheNamesCallback> callback)
+    RequestCacheNames(const String& securityOrigin, std::unique_ptr<RequestCacheNamesCallback> callback)
         : m_securityOrigin(securityOrigin)
         , m_callback(std::move(callback))
     {
     }
 
     ~RequestCacheNames() override { }
 
     void onSuccess(const WebVector<WebString>& caches) override
     {
-        OwnPtr<Array<Cache>> array = Array<Cache>::create();
+        std::unique_ptr<Array<Cache>> array = Array<Cache>::create();
         for (size_t i = 0; i < caches.size(); i++) {
             String name = String(caches[i]);
-            OwnPtr<Cache> entry = Cache::create()
+            std::unique_ptr<Cache> entry = Cache::create()
                 .setSecurityOrigin(m_securityOrigin)
                 .setCacheName(name)
                 .setCacheId(buildCacheId(m_securityOrigin, name)).build();
             array->addItem(std::move(entry));
         }
         m_callback->sendSuccess(std::move(array));
     }
 
     void onError(WebServiceWorkerCacheError error) override
     {
         m_callback->sendFailure(String::format("Error requesting cache names: %s", serviceWorkerCacheErrorString(error).data()));
     }
 
 private:
     String m_securityOrigin;
-    OwnPtr<RequestCacheNamesCallback> m_callback;
+    std::unique_ptr<RequestCacheNamesCallback> m_callback;
 };
 
 struct DataRequestParams {
     String cacheName;
     int skipCount;
     int pageSize;
 };
 
 struct RequestResponse {
     RequestResponse() { }
     RequestResponse(const String& request, const String& response)
         : request(request)
         , response(response)
     {
     }
     String request;
     String response;
 };
 
 class ResponsesAccumulator : public RefCounted<ResponsesAccumulator> {
     WTF_MAKE_NONCOPYABLE(ResponsesAccumulator);
 
 public:
-    ResponsesAccumulator(int numResponses, const DataRequestParams& params, PassOwnPtr<RequestEntriesCallback> callback)
+    ResponsesAccumulator(int numResponses, const DataRequestParams& params, std::unique_ptr<RequestEntriesCallback> callback)
         : m_params(params)
         , m_numResponsesLeft(numResponses)
         , m_responses(static_cast<size_t>(numResponses))
         , m_callback(std::move(callback))
     {
     }
 
     void addRequestResponsePair(const WebServiceWorkerRequest& request, const WebServiceWorkerResponse& response)
     {
         ASSERT(m_numResponsesLeft > 0);
         RequestResponse& requestResponse = m_responses.at(m_responses.size() - m_numResponsesLeft);
         requestResponse.request = request.url().string();
         requestResponse.response = response.statusText();
 
         if (--m_numResponsesLeft != 0)
             return;
 
         std::sort(m_responses.begin(), m_responses.end(),
             [](const RequestResponse& a, const RequestResponse& b)
             {
                 return WTF::codePointCompareLessThan(a.request, b.request);
             });
         if (m_params.skipCount > 0)
             m_responses.remove(0, m_params.skipCount);
         bool hasMore = false;
         if (static_cast<size_t>(m_params.pageSize) < m_responses.size()) {
             m_responses.remove(m_params.pageSize, m_responses.size() - m_params.pageSize);
             hasMore = true;
         }
-        OwnPtr<Array<DataEntry>> array = Array<DataEntry>::create();
+        std::unique_ptr<Array<DataEntry>> array = Array<DataEntry>::create();
         for (const auto& requestResponse : m_responses) {
-            OwnPtr<DataEntry> entry = DataEntry::create()
+            std::unique_ptr<DataEntry> entry = DataEntry::create()
                 .setRequest(requestResponse.request)
                 .setResponse(requestResponse.response).build();
             array->addItem(std::move(entry));
         }
         m_callback->sendSuccess(std::move(array), hasMore);
     }
 
     void sendFailure(const String& error)
     {
         m_callback->sendFailure(error);
     }
 
 private:
     DataRequestParams m_params;
     int m_numResponsesLeft;
     Vector<RequestResponse> m_responses;
-    OwnPtr<RequestEntriesCallback> m_callback;
+    std::unique_ptr<RequestEntriesCallback> m_callback;
 };
 
 class GetCacheResponsesForRequestData : public WebServiceWorkerCache::CacheMatchCallbacks {
     WTF_MAKE_NONCOPYABLE(GetCacheResponsesForRequestData);
 
 public:
     GetCacheResponsesForRequestData(const DataRequestParams& params, const WebServiceWorkerRequest& request, PassRefPtr<ResponsesAccumulator> accum)
         : m_params(params)
         , m_request(request)
         , m_accumulator(accum)
@@ skipping 14 matching lines @@
 private:
     DataRequestParams m_params;
     WebServiceWorkerRequest m_request;
     RefPtr<ResponsesAccumulator> m_accumulator;
 };
 
 class GetCacheKeysForRequestData : public WebServiceWorkerCache::CacheWithRequestsCallbacks {
     WTF_MAKE_NONCOPYABLE(GetCacheKeysForRequestData);
 
 public:
-    GetCacheKeysForRequestData(const DataRequestParams& params, PassOwnPtr<WebServiceWorkerCache> cache, PassOwnPtr<RequestEntriesCallback> callback)
+    GetCacheKeysForRequestData(const DataRequestParams& params, PassOwnPtr<WebServiceWorkerCache> cache, std::unique_ptr<RequestEntriesCallback> callback)
         : m_params(params)
         , m_cache(std::move(cache))
         , m_callback(std::move(callback))
     {
     }
     ~GetCacheKeysForRequestData() override { }
 
     WebServiceWorkerCache* cache() { return m_cache.get(); }
     void onSuccess(const WebVector<WebServiceWorkerRequest>& requests) override
     {
         if (requests.isEmpty()) {
-            OwnPtr<Array<DataEntry>> array = Array<DataEntry>::create();
+            std::unique_ptr<Array<DataEntry>> array = Array<DataEntry>::create();
             m_callback->sendSuccess(std::move(array), false);
             return;
         }
         RefPtr<ResponsesAccumulator> accumulator = adoptRef(new ResponsesAccumulator(requests.size(), m_params, std::move(m_callback)));
 
         for (size_t i = 0; i < requests.size(); i++) {
             const auto& request = requests[i];
             auto* cacheRequest = new GetCacheResponsesForRequestData(m_params, request, accumulator);
             m_cache->dispatchMatch(cacheRequest, request, WebServiceWorkerCache::QueryParams());
         }
     }
 
     void onError(WebServiceWorkerCacheError error) override
     {
         m_callback->sendFailure(String::format("Error requesting requests for cache %s: %s", m_params.cacheName.utf8().data(), serviceWorkerCacheErrorString(error).data()));
     }
 
 private:
     DataRequestParams m_params;
     OwnPtr<WebServiceWorkerCache> m_cache;
-    OwnPtr<RequestEntriesCallback> m_callback;
+    std::unique_ptr<RequestEntriesCallback> m_callback;
 };
 
 class GetCacheForRequestData
     : public WebServiceWorkerCacheStorage::CacheStorageWithCacheCallbacks {
     WTF_MAKE_NONCOPYABLE(GetCacheForRequestData);
 
 public:
-    GetCacheForRequestData(const DataRequestParams& params, PassOwnPtr<RequestEntriesCallback> callback)
+    GetCacheForRequestData(const DataRequestParams& params, std::unique_ptr<RequestEntriesCallback> callback)
         : m_params(params)
         , m_callback(std::move(callback))
     {
     }
     ~GetCacheForRequestData() override { }
 
     void onSuccess(std::unique_ptr<WebServiceWorkerCache> cache) override
     {
         auto* cacheRequest = new GetCacheKeysForRequestData(m_params, adoptPtr(cache.release()), std::move(m_callback));
         cacheRequest->cache()->dispatchKeys(cacheRequest, nullptr, WebServiceWorkerCache::QueryParams());
     }
 
     void onError(WebServiceWorkerCacheError error) override
     {
         m_callback->sendFailure(String::format("Error requesting cache %s: %s", m_params.cacheName.utf8().data(), serviceWorkerCacheErrorString(error).data()));
     }
 
 private:
     DataRequestParams m_params;
-    OwnPtr<RequestEntriesCallback> m_callback;
+    std::unique_ptr<RequestEntriesCallback> m_callback;
 };
 
 class DeleteCache : public WebServiceWorkerCacheStorage::CacheStorageCallbacks {
     WTF_MAKE_NONCOPYABLE(DeleteCache);
 
 public:
-    DeleteCache(PassOwnPtr<DeleteCacheCallback> callback)
+    DeleteCache(std::unique_ptr<DeleteCacheCallback> callback)
         : m_callback(std::move(callback))
     {
     }
     ~DeleteCache() override { }
 
     void onSuccess() override
     {
         m_callback->sendSuccess();
     }
 
     void onError(WebServiceWorkerCacheError error) override
     {
         m_callback->sendFailure(String::format("Error requesting cache names: %s", serviceWorkerCacheErrorString(error).data()));
     }
 
 private:
-    OwnPtr<DeleteCacheCallback> m_callback;
+    std::unique_ptr<DeleteCacheCallback> m_callback;
 };
 
 class DeleteCacheEntry : public WebServiceWorkerCache::CacheBatchCallbacks {
     WTF_MAKE_NONCOPYABLE(DeleteCacheEntry);
 public:
 
-    DeleteCacheEntry(PassOwnPtr<DeleteEntryCallback> callback)
+    DeleteCacheEntry(std::unique_ptr<DeleteEntryCallback> callback)
         : m_callback(std::move(callback))
     {
     }
     ~DeleteCacheEntry() override { }
 
     void onSuccess() override
     {
         m_callback->sendSuccess();
     }
 
     void onError(WebServiceWorkerCacheError error) override
     {
         m_callback->sendFailure(String::format("Error requesting cache names: %s", serviceWorkerCacheErrorString(error).data()));
     }
 
 private:
-    OwnPtr<DeleteEntryCallback> m_callback;
+    std::unique_ptr<DeleteEntryCallback> m_callback;
 };
 
 class GetCacheForDeleteEntry
     : public WebServiceWorkerCacheStorage::CacheStorageWithCacheCallbacks {
     WTF_MAKE_NONCOPYABLE(GetCacheForDeleteEntry);
 
 public:
-    GetCacheForDeleteEntry(const String& requestSpec, const String& cacheName, PassOwnPtr<DeleteEntryCallback> callback)
+    GetCacheForDeleteEntry(const String& requestSpec, const String& cacheName, std::unique_ptr<DeleteEntryCallback> callback)
         : m_requestSpec(requestSpec)
         , m_cacheName(cacheName)
         , m_callback(std::move(callback))
     {
     }
     ~GetCacheForDeleteEntry() override { }
 
     void onSuccess(std::unique_ptr<WebServiceWorkerCache> cache) override
     {
         auto* deleteRequest = new DeleteCacheEntry(std::move(m_callback));
         BatchOperation deleteOperation;
         deleteOperation.operationType = WebServiceWorkerCache::OperationTypeDelete;
         deleteOperation.request.setURL(KURL(ParsedURLString, m_requestSpec));
         Vector<BatchOperation> operations;
         operations.append(deleteOperation);
         cache.release()->dispatchBatch(deleteRequest, WebVector<BatchOperation>(operations));
     }
 
     void onError(WebServiceWorkerCacheError error) override
     {
         m_callback->sendFailure(String::format("Error requesting cache %s: %s", m_cacheName.utf8().data(), serviceWorkerCacheErrorString(error).data()));
     }
 
 private:
     String m_requestSpec;
     String m_cacheName;
-    OwnPtr<DeleteEntryCallback> m_callback;
+    std::unique_ptr<DeleteEntryCallback> m_callback;
 };
 
 } // namespace
 
 InspectorCacheStorageAgent::InspectorCacheStorageAgent()
     : InspectorBaseAgent<InspectorCacheStorageAgent, protocol::Frontend::CacheStorage>("CacheStorage")
 {
 }
 
 InspectorCacheStorageAgent::~InspectorCacheStorageAgent() { }
 
 DEFINE_TRACE(InspectorCacheStorageAgent)
 {
     InspectorBaseAgent::trace(visitor);
 }
 
-void InspectorCacheStorageAgent::requestCacheNames(ErrorString* errorString, const String& securityOrigin, PassOwnPtr<RequestCacheNamesCallback> callback)
+void InspectorCacheStorageAgent::requestCacheNames(ErrorString* errorString, const String& securityOrigin, std::unique_ptr<RequestCacheNamesCallback> callback)
 {
     RefPtr<SecurityOrigin> secOrigin = SecurityOrigin::createFromString(securityOrigin);
 
     // Cache Storage API is restricted to trustworthy origins.
     if (!secOrigin->isPotentiallyTrustworthy()) {
         // Don't treat this as an error, just don't attempt to open and enumerate the caches.
         callback->sendSuccess(Array<protocol::CacheStorage::Cache>::create());
         return;
     }
 
     OwnPtr<WebServiceWorkerCacheStorage> cache = assertCacheStorage(errorString, securityOrigin);
     if (!cache) {
         callback->sendFailure(*errorString);
         return;
     }
     cache->dispatchKeys(new RequestCacheNames(securityOrigin, std::move(callback)));
 }
 
-void InspectorCacheStorageAgent::requestEntries(ErrorString* errorString, const String& cacheId, int skipCount, int pageSize, PassOwnPtr<RequestEntriesCallback> callback)
+void InspectorCacheStorageAgent::requestEntries(ErrorString* errorString, const String& cacheId, int skipCount, int pageSize, std::unique_ptr<RequestEntriesCallback> callback)
 {
     String cacheName;
     OwnPtr<WebServiceWorkerCacheStorage> cache = assertCacheStorageAndNameForId(errorString, cacheId, &cacheName);
     if (!cache) {
         callback->sendFailure(*errorString);
         return;
     }
     DataRequestParams params;
     params.cacheName = cacheName;
     params.pageSize = pageSize;
     params.skipCount = skipCount;
     cache->dispatchOpen(new GetCacheForRequestData(params, std::move(callback)), WebString(cacheName));
 }
 
-void InspectorCacheStorageAgent::deleteCache(ErrorString* errorString, const String& cacheId, PassOwnPtr<DeleteCacheCallback> callback)
+void InspectorCacheStorageAgent::deleteCache(ErrorString* errorString, const String& cacheId, std::unique_ptr<DeleteCacheCallback> callback)
 {
     String cacheName;
     OwnPtr<WebServiceWorkerCacheStorage> cache = assertCacheStorageAndNameForId(errorString, cacheId, &cacheName);
     if (!cache) {
         callback->sendFailure(*errorString);
         return;
     }
     cache->dispatchDelete(new DeleteCache(std::move(callback)), WebString(cacheName));
 }
 
-void InspectorCacheStorageAgent::deleteEntry(ErrorString* errorString, const String& cacheId, const String& request, PassOwnPtr<DeleteEntryCallback> callback)
+void InspectorCacheStorageAgent::deleteEntry(ErrorString* errorString, const String& cacheId, const String& request, std::unique_ptr<DeleteEntryCallback> callback)
 {
     String cacheName;
     OwnPtr<WebServiceWorkerCacheStorage> cache = assertCacheStorageAndNameForId(errorString, cacheId, &cacheName);
     if (!cache) {
         callback->sendFailure(*errorString);
         return;
     }
     cache->dispatchOpen(new GetCacheForDeleteEntry(request, cacheName, std::move(callback)), WebString(cacheName));
 }
 
 
 } // namespace blink