Revert "Separate preaload matching from MemoryCache"

third_party/WebKit/Source/core/loader/DocumentLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 199 matching lines @@
     case Resource::kImportResource:
       resource = RawResource::FetchImport(params, Fetcher());
       break;
     case Resource::kRaw:
       resource = RawResource::Fetch(params, Fetcher());
       break;
     default:
       NOTREACHED();
   }
 
+  // CSP layout tests verify that preloads are subject to access checks by
+  // seeing if they are in the `preload started` list. Therefore do not add
+  // them to the list if the load is immediately denied.
+  if (resource && !resource->GetResourceError().IsAccessCheck())
+    Fetcher()->PreloadStarted(resource);
   return resource;
 }
 
 void DocumentLoader::SetServiceWorkerNetworkProvider(
     std::unique_ptr<WebServiceWorkerNetworkProvider> provider) {
   service_worker_network_provider_ = std::move(provider);
 }
 
 void DocumentLoader::SetSourceLocation(
     std::unique_ptr<SourceLocation> source_location) {
@@ skipping 873 matching lines @@
                      InstallNewDocumentReason::kJavascriptURL,
                      kForceSynchronousParsing, KURL());
   if (!source.IsNull())
     writer_->AppendReplacingData(source);
   EndWriting();
 }
 
 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader);
 
 }  // namespace blink