CacheStorage: Remove unused responses param from callbacks for batch operations (3)

(1) Chromium: https://codereview.chromium.org/1112803006/
(2) Blink: https://codereview.chromium.org/1112963002/
(3) Chromium: THIS PATCH
(4) Blink: https://codereview.chromium.org/1107973005

BUG=482827
TEST=compile

Review URL: https://codereview.chromium.org/1111183007

Cr-Commit-Position: refs/heads/master@{#328441}

2 files changed, 0 insertions, 30 deletions

diff --git a/content/renderer/cache_storage/cache_storage_dispatcher.cc b/content/renderer/cache_storage/cache_storage_dispatcher.cc
index 244860d..3bd974f 100644
--- a/content/renderer/cache_storage/cache_storage_dispatcher.cc
+++ b/content/renderer/cache_storage/cache_storage_dispatcher.cc
@@ -176,11 +176,7 @@ class CacheStorageDispatcher::WebCache : public blink::WebServiceWorkerCache {
                                       query_params);
   }
   virtual void dispatchBatch(
-#ifdef CRBUG_482827
       CacheBatchCallbacks* callbacks,
-#else
-      CacheWithResponsesCallbacks* callbacks,
-#endif
       const blink::WebVector<BatchOperation>& batch_operations) {
     if (!dispatcher_)
       return;
@@ -473,15 +469,9 @@ void CacheStorageDispatcher::OnCacheBatchSuccess(
 
   UMA_HISTOGRAM_TIMES("ServiceWorkerCache.Cache.Batch",
                       TimeTicks::Now() - cache_batch_times_[request_id]);
-#ifdef CRBUG_482827
   blink::WebServiceWorkerCache::CacheBatchCallbacks* callbacks =
       cache_batch_callbacks_.Lookup(request_id);
   callbacks->onSuccess();
-#else
-  blink::WebServiceWorkerCache::CacheWithResponsesCallbacks* callbacks =
-      cache_batch_callbacks_.Lookup(request_id);
-  callbacks->onSuccess(&web_responses);
-#endif
   cache_batch_callbacks_.Remove(request_id);
   cache_batch_times_.erase(request_id);
 }
@@ -527,13 +517,8 @@ void CacheStorageDispatcher::OnCacheBatchError(
     int request_id,
     blink::WebServiceWorkerCacheError reason) {
   DCHECK_EQ(thread_id, CurrentWorkerId());
-#ifdef CRBUG_482827
   blink::WebServiceWorkerCache::CacheBatchCallbacks* callbacks =
       cache_batch_callbacks_.Lookup(request_id);
-#else
-  blink::WebServiceWorkerCache::CacheWithResponsesCallbacks* callbacks =
-      cache_batch_callbacks_.Lookup(request_id);
-#endif
   callbacks->onError(&reason);
   cache_batch_callbacks_.Remove(request_id);
   cache_batch_times_.erase(request_id);
@@ -636,11 +621,7 @@ void CacheStorageDispatcher::dispatchKeysForCache(
 
 void CacheStorageDispatcher::dispatchBatchForCache(
     int cache_id,
-#ifdef CRBUG_482827
     blink::WebServiceWorkerCache::CacheBatchCallbacks* callbacks,
-#else
-    blink::WebServiceWorkerCache::CacheWithResponsesCallbacks* callbacks,
-#endif
     const blink::WebVector<blink::WebServiceWorkerCache::BatchOperation>&
         web_operations) {
   int request_id = cache_batch_callbacks_.Add(callbacks);
diff --git a/content/renderer/cache_storage/cache_storage_dispatcher.h b/content/renderer/cache_storage/cache_storage_dispatcher.h
index c07de7f..3db1e5a 100644
--- a/content/renderer/cache_storage/cache_storage_dispatcher.h
+++ b/content/renderer/cache_storage/cache_storage_dispatcher.h
@@ -144,11 +144,7 @@ class CacheStorageDispatcher : public WorkerTaskRunner::Observer {
       const blink::WebServiceWorkerCache::QueryParams& query_params);
   void dispatchBatchForCache(
       int cache_id,
-#ifdef CRBUG_482827
       blink::WebServiceWorkerCache::CacheBatchCallbacks* callbacks,
-#else
-      blink::WebServiceWorkerCache::CacheWithResponsesCallbacks* callbacks,
-#endif
       const blink::WebVector<blink::WebServiceWorkerCache::BatchOperation>&
           batch_operations);
 
@@ -175,11 +171,8 @@ class CacheStorageDispatcher : public WorkerTaskRunner::Observer {
                 IDMapOwnPointer> WithResponsesCallbacksMap;
   typedef IDMap<blink::WebServiceWorkerCache::CacheWithRequestsCallbacks,
                 IDMapOwnPointer> WithRequestsCallbacksMap;
-
-#ifdef CRBUG_482827
   using BatchCallbacksMap =
       IDMap<blink::WebServiceWorkerCache::CacheBatchCallbacks, IDMapOwnPointer>;
-#endif
 
   static int32 CurrentWorkerId() {
     return WorkerTaskRunner::Instance()->CurrentWorkerId();
@@ -214,11 +207,7 @@ class CacheStorageDispatcher : public WorkerTaskRunner::Observer {
   MatchCallbacksMap cache_match_callbacks_;
   WithResponsesCallbacksMap cache_match_all_callbacks_;
   WithRequestsCallbacksMap cache_keys_callbacks_;
-#ifdef CRBUG_482827
   BatchCallbacksMap cache_batch_callbacks_;
-#else
-  WithResponsesCallbacksMap cache_batch_callbacks_;
-#endif
 
   TimeMap cache_match_times_;
   TimeMap cache_match_all_times_;