Revert 178571 "Teach ContentSecurityPolicy about WebURLRequest::..."

trunk/Source/core/fetch/CachingCorrectnessTest.cpp

 /*
  * Copyright (c) 2014, 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 21 matching lines @@
 
 #include "core/fetch/ImageResource.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/fetch/Resource.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/fetch/ResourcePtr.h"
 #include "core/html/HTMLDocument.h"
 #include "core/loader/DocumentLoader.h"
 #include "platform/network/ResourceRequest.h"
 #include "public/platform/Platform.h"
-#include "public/platform/WebURLRequest.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/RefPtr.h"
 
 #include <gtest/gtest.h>
 
 using namespace blink;
 
 namespace {
 
 // An URL for the original request.
@@ skipping 14 matching lines @@
     {
         m_proxyPlatform.advanceClock(seconds);
     }
 
     ResourcePtr<Resource> resourceFromResourceResponse(ResourceResponse response, Resource::Type type = Resource::Raw)
     {
         if (response.url().isNull())
             response.setURL(KURL(ParsedURLString, kResourceURL));
         ResourcePtr<Resource> resource =
             new Resource(ResourceRequest(response.url()), type);
-        resource->resourceRequest().setRequestContext(blink::WebURLRequest::RequestContextInternal);
         resource->setResponse(response);
         memoryCache()->add(resource.get());
 
         return resource;
     }
 
     ResourcePtr<Resource> resourceFromResourceRequest(ResourceRequest request, Resource::Type type = Resource::Raw)
     {
         if (request.url().isNull())
             request.setURL(KURL(ParsedURLString, kResourceURL));
         ResourcePtr<Resource> resource =
             new Resource(request, type);
-        request.setRequestContext(blink::WebURLRequest::RequestContextInternal);
         resource->setResponse(ResourceResponse(KURL(ParsedURLString, kResourceURL), "text/html", 0, nullAtom, String()));
         memoryCache()->add(resource.get());
 
         return resource;
     }
 
     ResourcePtr<Resource> fetch()
     {
         FetchRequest fetchRequest(ResourceRequest(KURL(ParsedURLString, kResourceURL)), FetchInitiatorInfo());
-        fetchRequest.mutableResourceRequest().setRequestContext(blink::WebURLRequest::RequestContextFetch);
         return m_fetcher->fetchSynchronously(fetchRequest);
     }
 
     ResourcePtr<Resource> fetchImage()
     {
         FetchRequest fetchRequest(ResourceRequest(KURL(ParsedURLString, kResourceURL)), FetchInitiatorInfo());
-        fetchRequest.mutableResourceRequest().setRequestContext(blink::WebURLRequest::RequestContextImage);
         return m_fetcher->fetchImage(fetchRequest);
     }
 
     ResourceFetcher* fetcher() const { return m_fetcher.get(); }
 
 private:
     // A simple platform that mocks out the clock, for cache freshness testing.
     class ProxyPlatform : public blink::Platform {
     public:
         ProxyPlatform() : m_elapsedSeconds(0.) { }
@@ skipping 338 matching lines @@
 
     advanceClock(500.);
 
     ResourcePtr<Resource> fetched = fetch();
     EXPECT_NE(firstResource, fetched);
 }
 
 TEST_F(CachingCorrectnessTest, PostToSameURLTwice)
 {
     ResourceRequest request1(KURL(ParsedURLString, kResourceURL));
-    request1.setRequestContext(blink::WebURLRequest::RequestContextInternal);
     request1.setHTTPMethod("POST");
     ResourcePtr<Resource> resource1 = new Resource(ResourceRequest(request1.url()), Resource::Raw);
     resource1->setLoading(true);
     memoryCache()->add(resource1.get());
 
     ResourceRequest request2(KURL(ParsedURLString, kResourceURL));
-    request2.setRequestContext(blink::WebURLRequest::RequestContextInternal);
     request2.setHTTPMethod("POST");
     FetchRequest fetch2(request2, FetchInitiatorInfo());
     ResourcePtr<Resource> resource2 = fetcher()->fetchSynchronously(fetch2);
 
     EXPECT_EQ(resource2, memoryCache()->resourceForURL(request2.url()));
     EXPECT_NE(resource1, resource2);
 }
 
 TEST_F(CachingCorrectnessTest, 302RedirectNotImplicitlyFresh)
 {
@@ skipping 94 matching lines @@
     firstResource->setResponse(fresh200Response);
     memoryCache()->add(firstResource.get());
 
     advanceClock(500.);
 
     ResourcePtr<Resource> fetched = fetch();
     EXPECT_EQ(firstResource, fetched);
 }
 
 } // namespace