Refactor cache counting into a separate helper class

components/browsing_data/content/storage_partition_http_cache_data_remover.h

 // 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.
 
 #ifndef COMPONENTS_BROWSING_DATA_CONTENT_STORAGE_PARTITION_HTTP_CACHE_DATA_REMOVER_H_
 #define COMPONENTS_BROWSING_DATA_CONTENT_STORAGE_PARTITION_HTTP_CACHE_DATA_REMOVER_H_
 
 #include <stdint.h>
 
 #include "base/callback.h"
@@ skipping 33 matching lines @@
   // to the cache interface and might be slower.
   static StoragePartitionHttpCacheDataRemover* CreateForURLsAndRange(
       content::StoragePartition* storage_partition,
       const base::Callback<bool(const GURL&)>& url_predicate,
       base::Time delete_begin,
       base::Time delete_end);
 
   // Calls |done_callback| upon completion and also destroys itself.
   void Remove(const base::Closure& done_callback);
 
-  // Counts the total size of entries that would be removed by calling |Remove|.
-  // Reports it via |result_callback| and then destroys itself.
-  void Count(const net::Int64CompletionCallback& result_callback);
-
  private:
   enum CacheState {
-    STATE_NONE,
-    STATE_CREATE_MAIN,
-    STATE_CREATE_MEDIA,
-    STATE_PROCESS_MAIN,
-    STATE_PROCESS_MEDIA,
-    STATE_DONE
+    NONE,
+    CREATE_MAIN,
+    CREATE_MEDIA,
+    DELETE_MAIN,
+    DELETE_MEDIA,
+    DONE
   };
 
   StoragePartitionHttpCacheDataRemover(
       base::Callback<bool(const GURL&)> url_predicate,
       base::Time delete_begin,
       base::Time delete_end,
       net::URLRequestContextGetter* main_context_getter,
       net::URLRequestContextGetter* media_context_getter);
 
   // StoragePartitionHttpCacheDataRemover deletes itself (using DeleteHelper)
   // and is not supposed to be deleted by other objects so make destructor
   // private and DeleteHelper a friend.
   friend class base::DeleteHelper<StoragePartitionHttpCacheDataRemover>;
 
   ~StoragePartitionHttpCacheDataRemover();
 
   void ClearHttpCacheOnIOThread();
-  void CountHttpCacheOnIOThread();
-
   void ClearedHttpCache();
-  void CountedHttpCache();
-
   // Performs the actual work to delete or count the cache.
   void DoClearCache(int rv);
-  void DoCountCache(int rv);
 
   base::Callback<bool(const GURL&)> url_predicate_;
   const base::Time delete_begin_;
   const base::Time delete_end_;
 
   const scoped_refptr<net::URLRequestContextGetter> main_context_getter_;
   const scoped_refptr<net::URLRequestContextGetter> media_context_getter_;
 
   base::Closure done_callback_;
-  net::Int64CompletionCallback result_callback_;
 
   // IO.
   int next_cache_state_;
   disk_cache::Backend* cache_;
 
-  // Stores the cache size computation result before it can be returned
-  // via a callback. This is either the sum of size of the the two cache
-  // backends, or an error code if the calculation failed.
-  int64_t calculation_result_;
-
   DISALLOW_COPY_AND_ASSIGN(StoragePartitionHttpCacheDataRemover);
 };
 
 }  // namespace browsing_data
 
 #endif  // COMPONENTS_BROWSING_DATA_CONTENT_STORAGE_PARTITION_HTTP_CACHE_DATA_REMOVER_H_