Revert of Remove ResourceFetcher's access to a real FetchContext at frame detach time

Source/core/loader/FrameFetchContextTest.cpp

 /*
  * Copyright (c) 2015, 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 41 matching lines @@
     {
     }
 
 protected:
     virtual void SetUp()
     {
         dummyPageHolder = DummyPageHolder::create(IntSize(500, 500));
         dummyPageHolder->page().setDeviceScaleFactor(1.0);
         documentLoader = DocumentLoader::create(&dummyPageHolder->frame(), ResourceRequest("http://www.example.com"), SubstituteData());
         document = toHTMLDocument(&dummyPageHolder->document());
-        fetchContext = &documentLoader->fetcher()->context();
-        FrameFetchContext::provideDocumentToContext(*fetchContext, document.get());
+        fetchContext = &static_cast<FrameFetchContext&>(documentLoader->fetcher()->context());
+        fetchContext->setDocument(document.get());
     }
 
     void expectUpgrade(const char* input, const char* expected)
     {
         expectUpgrade(input, WebURLRequest::RequestContextScript, WebURLRequest::FrameTypeNone, expected);
     }
 
     void expectUpgrade(const char* input, WebURLRequest::RequestContext requestContext, WebURLRequest::FrameType frameType, const char* expected)
     {
         KURL inputURL(ParsedURLString, input);
@@ skipping 29 matching lines @@
 
     KURL secureURL;
     RefPtr<SecurityOrigin> exampleOrigin;
     RefPtr<SecurityOrigin> secureOrigin;
 
     OwnPtr<DummyPageHolder> dummyPageHolder;
     // We don't use the DocumentLoader directly in any tests, but need to keep it around as long
     // as the ResourceFetcher and Document live due to indirect usage.
     RefPtr<DocumentLoader> documentLoader;
     RefPtrWillBePersistent<Document> document;
-    FetchContext* fetchContext;
+    FrameFetchContext* fetchContext;
 };
 
 TEST_F(FrameFetchContextUpgradeTest, UpgradeInsecureResourceRequests)
 {
     struct TestCase {
         const char* original;
         const char* upgraded;
     } tests[] = {
         { "http://example.test/image.png", "https://example.test/image.png" },
         { "http://example.test:80/image.png", "https://example.test:443/image.png" },
@@ skipping 80 matching lines @@
 public:
     FrameFetchContextHintsTest() { }
 
 protected:
     virtual void SetUp()
     {
         dummyPageHolder = DummyPageHolder::create(IntSize(500, 500));
         dummyPageHolder->page().setDeviceScaleFactor(1.0);
         documentLoader = DocumentLoader::create(&dummyPageHolder->frame(), ResourceRequest("http://www.example.com"), SubstituteData());
         document = toHTMLDocument(&dummyPageHolder->document());
-        fetchContext = &documentLoader->fetcher()->context();
-        FrameFetchContext::provideDocumentToContext(*fetchContext, document.get());
+        fetchContext = &static_cast<FrameFetchContext&>(documentLoader->fetcher()->context());
+        fetchContext->setDocument(document.get());
     }
 
     void expectHeader(const char* input, const char* headerName, bool isPresent, const char* headerValue)
     {
         KURL inputURL(ParsedURLString, input);
         FetchRequest fetchRequest = FetchRequest(ResourceRequest(inputURL), FetchInitiatorInfo());
         fetchContext->addClientHintsIfNecessary(fetchRequest);
 
         EXPECT_STREQ(isPresent ? headerValue : "",
             fetchRequest.resourceRequest().httpHeaderField(headerName).utf8().data());
     }
 
     OwnPtr<DummyPageHolder> dummyPageHolder;
     // We don't use the DocumentLoader directly in any tests, but need to keep it around as long
     // as the ResourceFetcher and Document live due to indirect usage.
     RefPtr<DocumentLoader> documentLoader;
     RefPtrWillBePersistent<Document> document;
-    FetchContext* fetchContext;
+    FrameFetchContext* fetchContext;
 };
 
 TEST_F(FrameFetchContextHintsTest, MonitorDPRHints)
 {
     expectHeader("http://www.example.com/1.gif", "DPR", false, "");
     dummyPageHolder->frame().setShouldSendDPRHint();
     expectHeader("http://www.example.com/1.gif", "DPR", true, "1");
     dummyPageHolder->page().setDeviceScaleFactor(2.5);
     expectHeader("http://www.example.com/1.gif", "DPR", true, "2.5");
     expectHeader("http://www.example.com/1.gif", "RW", false, "");
@@ skipping 16 matching lines @@
     expectHeader("http://www.example.com/1.gif", "RW", false, "");
 
     dummyPageHolder->frame().setShouldSendDPRHint();
     dummyPageHolder->frame().setShouldSendRWHint();
     expectHeader("http://www.example.com/1.gif", "DPR", true, "1");
     expectHeader("http://www.example.com/1.gif", "RW", true, "500");
 }
 
 } // namespace