Revert of Cache SubResourceIntegrity checks at Resource (patchset #2 id:20001 of https://codereview…

third_party/WebKit/Source/core/fetch/Resource.h

Index: third_party/WebKit/Source/core/fetch/Resource.h
diff --git a/third_party/WebKit/Source/core/fetch/Resource.h b/third_party/WebKit/Source/core/fetch/Resource.h
index a8066ef6e97e8cb0c18a6bd1a3447aa9b2043f2c..d8a496f8d4d9b2a0faa5ec778cf6056c22c2e26f 100644
--- a/third_party/WebKit/Source/core/fetch/Resource.h
+++ b/third_party/WebKit/Source/core/fetch/Resource.h
@@ -26,7 +26,6 @@
 
 #include "core/CoreExport.h"
 #include "core/fetch/CachedMetadataHandler.h"
-#include "core/fetch/IntegrityMetadata.h"
 #include "core/fetch/ResourceLoaderOptions.h"
 #include "platform/MemoryCoordinator.h"
 #include "platform/SharedBuffer.h"
@@ -196,6 +195,8 @@ class CORE_EXPORT Resource : public GarbageCollectedFinalized<Resource>,
   bool passesAccessControlCheck(SecurityOrigin*,
                                 String& errorDescription) const;
 
+  bool isEligibleForIntegrityCheck(SecurityOrigin*) const;
+
   virtual PassRefPtr<const SharedBuffer> resourceBuffer() const {
     return m_data;
   }
@@ -253,21 +254,10 @@ class CORE_EXPORT Resource : public GarbageCollectedFinalized<Resource>,
   bool isCacheValidator() const { return m_isRevalidating; }
   bool hasCacheControlNoStoreHeader() const;
   bool hasVaryHeader() const;
-
-  bool isEligibleForIntegrityCheck(SecurityOrigin*) const;
-
-  void setIntegrityMetadata(const IntegrityMetadataSet& metadata) {
-    m_integrityMetadata = metadata;
-  }
-  const IntegrityMetadataSet& integrityMetadata() const {
-    return m_integrityMetadata;
+  virtual bool mustRefetchDueToIntegrityMetadata(
+      const FetchRequest& request) const {
+    return false;
   }
-  // The argument must never be |NotChecked|.
-  void setIntegrityDisposition(ResourceIntegrityDisposition);
-  ResourceIntegrityDisposition integrityDisposition() const {
-    return m_integrityDisposition;
-  }
-  bool mustRefetchDueToIntegrityMetadata(const FetchRequest&) const;
 
   double currentAge() const;
   double freshnessLifetime();
@@ -424,9 +414,6 @@ class CORE_EXPORT Resource : public GarbageCollectedFinalized<Resource>,
   bool m_isRevalidating : 1;
   bool m_isAlive : 1;
 
-  ResourceIntegrityDisposition m_integrityDisposition;
-  IntegrityMetadataSet m_integrityMetadata;
-
   bool m_isAddRemoveClientProhibited;
 
   // Ordered list of all redirects followed while fetching this resource.