| Index: content/browser/cache_storage/cache_storage_dispatcher_host.cc
|
| diff --git a/content/browser/cache_storage/cache_storage_dispatcher_host.cc b/content/browser/cache_storage/cache_storage_dispatcher_host.cc
|
| index c912c15a34391d08a2ed7e6e17873d53d0451278..073f57d80272b7c5f1aba82b17bf846d51b5515b 100644
|
| --- a/content/browser/cache_storage/cache_storage_dispatcher_host.cc
|
| +++ b/content/browser/cache_storage/cache_storage_dispatcher_host.cc
|
| @@ -5,6 +5,7 @@
|
| #include "content/browser/cache_storage/cache_storage_dispatcher_host.h"
|
|
|
| #include <stddef.h>
|
| +#include <utility>
|
|
|
| #include "base/bind.h"
|
| #include "base/logging.h"
|
| @@ -190,13 +191,14 @@ void CacheStorageDispatcherHost::OnCacheStorageMatch(
|
|
|
| if (match_params.cache_name.empty()) {
|
| context_->cache_manager()->MatchAllCaches(
|
| - origin, scoped_request.Pass(),
|
| + origin, std::move(scoped_request),
|
| base::Bind(&CacheStorageDispatcherHost::OnCacheStorageMatchCallback,
|
| this, thread_id, request_id));
|
| return;
|
| }
|
| context_->cache_manager()->MatchCache(
|
| - origin, base::UTF16ToUTF8(match_params.cache_name), scoped_request.Pass(),
|
| + origin, base::UTF16ToUTF8(match_params.cache_name),
|
| + std::move(scoped_request),
|
| base::Bind(&CacheStorageDispatcherHost::OnCacheStorageMatchCallback, this,
|
| thread_id, request_id));
|
| }
|
| @@ -219,7 +221,7 @@ void CacheStorageDispatcherHost::OnCacheMatch(
|
| new ServiceWorkerFetchRequest(request.url, request.method,
|
| request.headers, request.referrer,
|
| request.is_reload));
|
| - cache->Match(scoped_request.Pass(),
|
| + cache->Match(std::move(scoped_request),
|
| base::Bind(&CacheStorageDispatcherHost::OnCacheMatchCallback,
|
| this, thread_id, request_id, cache));
|
| }
|
| @@ -250,7 +252,7 @@ void CacheStorageDispatcherHost::OnCacheMatchAll(
|
| request.headers, request.referrer,
|
| request.is_reload));
|
| cache->Match(
|
| - scoped_request.Pass(),
|
| + std::move(scoped_request),
|
| base::Bind(&CacheStorageDispatcherHost::OnCacheMatchAllCallbackAdapter,
|
| this, thread_id, request_id, cache));
|
| }
|
| @@ -419,8 +421,8 @@ void CacheStorageDispatcherHost::OnCacheMatchAllCallbackAdapter(
|
| if (blob_data_handle)
|
| blob_data_handles->push_back(*blob_data_handle);
|
| }
|
| - OnCacheMatchAllCallback(thread_id, request_id, cache, error, responses.Pass(),
|
| - blob_data_handles.Pass());
|
| + OnCacheMatchAllCallback(thread_id, request_id, cache, error,
|
| + std::move(responses), std::move(blob_data_handles));
|
| }
|
|
|
| void CacheStorageDispatcherHost::OnCacheMatchAllCallback(
|
|
|