[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 fe0f2116f37b14f7b83e0dfdd76191870942a802..8f59a8eb3f4bb837629882c4a61999c94bee7eea 100644
--- a/content/browser/cache_storage/cache_storage.h
+++ b/content/browser/cache_storage/cache_storage.h
@@ -14,6 +14,7 @@
 
 #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"
@@ -119,12 +120,13 @@ class CONTENT_EXPORT CacheStorage : public CacheStorageCacheObserver {
   void CompleteAsyncOperationForTesting();
 
   // CacheStorageCacheObserver:
-  void CacheSizeUpdated(const CacheStorageCache* cache, int64_t size) override;
+  void CacheSizeUpdated(const CacheStorageCache* cache) override;
 
  private:
   friend class CacheStorageCacheHandle;
   friend class CacheStorageCache;
   friend class CacheStorageManagerTest;
+  FRIEND_TEST_ALL_PREFIXES(CacheStorageManagerTest, PersistedCacheKeyUsed);
   class CacheLoader;
   class MemoryLoader;
   class SimpleCacheLoader;
@@ -132,6 +134,9 @@ class CONTENT_EXPORT CacheStorage : public CacheStorageCacheObserver {
 
   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(
       CacheStorageCache* cache);