[CacheStorage] Sort QueryCache results by time entered into cache

content/browser/cache_storage/cache_storage_dispatcher_host.cc

 // Copyright 2015 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 "content/browser/cache_storage/cache_storage_dispatcher_host.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 441 matching lines @@
     std::unique_ptr<ServiceWorkerResponse> response,
     std::unique_ptr<storage::BlobDataHandle> blob_data_handle) {
   std::unique_ptr<CacheStorageCache::Responses> responses(
       new CacheStorageCache::Responses);
   std::unique_ptr<CacheStorageCache::BlobDataHandles> blob_data_handles(
       new CacheStorageCache::BlobDataHandles);
   if (error == CACHE_STORAGE_OK) {
     DCHECK(response);
     responses->push_back(*response);
     if (blob_data_handle)
-      blob_data_handles->push_back(*blob_data_handle);
+      blob_data_handles->push_back(std::move(blob_data_handle));
   }
   OnCacheMatchAllCallback(thread_id, request_id, std::move(cache_handle), error,
                           std::move(responses), std::move(blob_data_handles));
 }
 
 void CacheStorageDispatcherHost::OnCacheMatchAllCallback(
     int thread_id,
     int request_id,
     std::unique_ptr<CacheStorageCacheHandle> cache_handle,
     CacheStorageError error,
     std::unique_ptr<CacheStorageCache::Responses> responses,
     std::unique_ptr<CacheStorageCache::BlobDataHandles> blob_data_handles) {
   if (error != CACHE_STORAGE_OK && error != CACHE_STORAGE_ERROR_NOT_FOUND) {
     Send(new CacheStorageMsg_CacheMatchAllError(
         thread_id, request_id, ToWebServiceWorkerCacheError(error)));
     return;
   }
 
-  for (const storage::BlobDataHandle& handle : *blob_data_handles)
-    StoreBlobDataHandle(handle);
+  for (const auto& handle : *blob_data_handles) {
+    if (handle)
+      StoreBlobDataHandle(*handle);
+  }
 
   Send(new CacheStorageMsg_CacheMatchAllSuccess(thread_id, request_id,
                                                 *responses));
 }
 
 void CacheStorageDispatcherHost::OnCacheKeysCallback(
     int thread_id,
     int request_id,
     std::unique_ptr<CacheStorageCacheHandle> cache_handle,
     CacheStorageError error,
     std::unique_ptr<CacheStorageCache::Requests> requests) {
   if (error != CACHE_STORAGE_OK) {
     Send(new CacheStorageMsg_CacheKeysError(
         thread_id, request_id, ToWebServiceWorkerCacheError(error)));
     return;
   }
 
-  CacheStorageCache::Requests out;
-
-  for (CacheStorageCache::Requests::const_iterator it = requests->begin();
-       it != requests->end(); ++it) {
-    ServiceWorkerFetchRequest request(it->url, it->method, it->headers,
-                                      it->referrer, it->is_reload);
-    out.push_back(request);
-  }
-
-  Send(new CacheStorageMsg_CacheKeysSuccess(thread_id, request_id, out));
+  Send(new CacheStorageMsg_CacheKeysSuccess(thread_id, request_id, *requests));
 }
 
 void CacheStorageDispatcherHost::OnCacheBatchCallback(
     int thread_id,
     int request_id,
     std::unique_ptr<CacheStorageCacheHandle> cache_handle,
     CacheStorageError error) {
   if (error != CACHE_STORAGE_OK) {
     Send(new CacheStorageMsg_CacheBatchError(
         thread_id, request_id, ToWebServiceWorkerCacheError(error)));
@@ skipping 27 matching lines @@
   UUIDToBlobDataHandleList::iterator it = blob_handle_store_.find(uuid);
   if (it == blob_handle_store_.end())
     return;
   DCHECK(!it->second.empty());
   it->second.pop_front();
   if (it->second.empty())
     blob_handle_store_.erase(it);
 }
 
 }  // namespace content