DevTools Disable cache should properly handle LoadOnlyFromCache resources

third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp

Index: third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
index 8e4b279b3fa0fdc786943babf6627663822abd35..5105488d1075419512ef874a4c21adde757db359 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
@@ -491,8 +491,9 @@ Resource* ResourceFetcher::requestResource(
 
   context().populateRequestData(request.mutableResourceRequest());
   if (request.resourceRequest().httpHeaderField("Upgrade-Insecure-Requests") !=
-      AtomicString("1"))
+      AtomicString("1")) {
     context().modifyRequestForCSP(request.mutableResourceRequest());
+  }
   context().addClientHintsIfNecessary(request);
   context().addCSPHeaderIfNecessary(factory.type(), request);
 
@@ -502,6 +503,12 @@ Resource* ResourceFetcher::requestResource(
   if (!request.url().isValid())
     return nullptr;
 
+  unsigned long identifier = createUniqueIdentifier();
+  request.mutableResourceRequest().setPriority(computeLoadPriority(
+      factory.type(), request, ResourcePriority::NotVisible));
+  initializeResourceRequest(request.mutableResourceRequest(), factory.type(),
+                            request.defer());
+
   if (!context().canRequest(
           factory.type(), request.resourceRequest(),
           MemoryCache::removeFragmentIdentifierIfNeeded(request.url()),
@@ -511,11 +518,6 @@ Resource* ResourceFetcher::requestResource(
     return resourceForBlockedRequest(request, factory);
   }
 
-  unsigned long identifier = createUniqueIdentifier();
-  request.mutableResourceRequest().setPriority(computeLoadPriority(
-      factory.type(), request, ResourcePriority::NotVisible));
-  initializeResourceRequest(request.mutableResourceRequest(), factory.type(),
-                            request.defer());
   context().willStartLoadingResource(
       identifier, request.mutableResourceRequest(), factory.type());
   if (!request.url().isValid())