CacheStorage: Support multiple batch operations

content/browser/cache_storage/cache_storage_manager_unittest.cc

 // 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 "content/browser/cache_storage/cache_storage_manager.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 172 matching lines @@
         base::Bind(&CacheStorageManagerTest::CacheMatchCallback,
                    base::Unretained(this), base::Unretained(loop.get())));
     loop->Run();
 
     bool error = callback_cache_error_ != CACHE_STORAGE_OK;
     return !error;
   }
 
   bool CachePut(const scoped_refptr<CacheStorageCache>& cache,
                 const GURL& url) {
-    scoped_ptr<ServiceWorkerFetchRequest> request(
-        new ServiceWorkerFetchRequest());
-    scoped_ptr<ServiceWorkerResponse> response(new ServiceWorkerResponse());
-    request->url = url;
-    response->url = url;
+    ServiceWorkerFetchRequest request;
+    ServiceWorkerResponse response;
+    request.url = url;
+    response.url = url;
+
+    CacheStorageBatchOperation operation;
+    operation.operation_type = CACHE_STORAGE_CACHE_OPERATION_TYPE_PUT;
+    operation.request = request;
+    operation.response = response;
+
     scoped_ptr<base::RunLoop> loop(new base::RunLoop());
-    cache->Put(
-        request.Pass(), response.Pass(),
+    cache->BatchOperation(
+        std::vector<CacheStorageBatchOperation>(1, operation),
         base::Bind(&CacheStorageManagerTest::CachePutCallback,
                    base::Unretained(this), base::Unretained(loop.get())));
     loop->Run();
 
     bool error = callback_cache_error_ != CACHE_STORAGE_OK;
     return !error;
   }
 
   bool CacheMatch(const scoped_refptr<CacheStorageCache>& cache,
                   const GURL& url) {
@@ skipping 582 matching lines @@
 
 INSTANTIATE_TEST_CASE_P(CacheStorageManagerTests,
                         CacheStorageManagerTestP,
                         ::testing::Values(false, true));
 
 INSTANTIATE_TEST_CASE_P(CacheStorageQuotaClientTests,
                         CacheStorageQuotaClientTestP,
                         ::testing::Values(false, true));
 
 }  // namespace content