Revert of [CacheStorage] Pad and bin opaque resource sizes.

content/browser/cache_storage/cache_storage.h

Index: content/browser/cache_storage/cache_storage.h
diff --git a/content/browser/cache_storage/cache_storage.h b/content/browser/cache_storage/cache_storage.h
index 8f59a8eb3f4bb837629882c4a61999c94bee7eea..fe0f2116f37b14f7b83e0dfdd76191870942a802 100644
--- a/content/browser/cache_storage/cache_storage.h
+++ b/content/browser/cache_storage/cache_storage.h
@@ -14,7 +14,6 @@
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
-#include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
@@ -120,22 +119,18 @@
   void CompleteAsyncOperationForTesting();
 
   // CacheStorageCacheObserver:
-  void CacheSizeUpdated(const CacheStorageCache* cache) override;
+  void CacheSizeUpdated(const CacheStorageCache* cache, int64_t size) override;
 
  private:
   friend class CacheStorageCacheHandle;
   friend class CacheStorageCache;
   friend class CacheStorageManagerTest;
-  FRIEND_TEST_ALL_PREFIXES(CacheStorageManagerTest, PersistedCacheKeyUsed);
   class CacheLoader;
   class MemoryLoader;
   class SimpleCacheLoader;
   struct CacheMatchResponse;
 
   typedef std::map<std::string, std::unique_ptr<CacheStorageCache>> CacheMap;
-
-  // Generate a new padding key. For testing only and *not thread safe*.
-  static void GenerateNewKeyForTesting();
 
   // Functions for exposing handles to CacheStorageCache to clients.
   std::unique_ptr<CacheStorageCacheHandle> CreateCacheHandle(