Revert of Oilpan: enable appcache + move DocumentLoader to the heap.

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 45 matching lines @@
     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());
     }
 
-    virtual void TearDown()
-    {
-        documentLoader->detachFromFrame();
-        documentLoader.clear();
-    }
-
     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);
         KURL expectedURL(ParsedURLString, expected);
 
@@ skipping 25 matching lines @@
             fetchRequest.resourceRequest().httpHeaderField("HTTPS").utf8().data());
     }
 
     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.
-    RefPtrWillBePersistent<DocumentLoader> documentLoader;
+    RefPtr<DocumentLoader> documentLoader;
     RefPtrWillBePersistent<Document> document;
     FetchContext* fetchContext;
 };
 
 TEST_F(FrameFetchContextUpgradeTest, UpgradeInsecureResourceRequests)
 {
     struct TestCase {
         const char* original;
         const char* upgraded;
     } tests[] = {
@@ skipping 101 matching lines @@
     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());
     }
 
-    virtual void TearDown()
-    {
-        documentLoader->detachFromFrame();
-        documentLoader.clear();
-    }
-
     void expectHeader(const char* input, const char* headerName, bool isPresent, const char* headerValue, float width = 0)
     {
         KURL inputURL(ParsedURLString, input);
         FetchRequest fetchRequest = FetchRequest(ResourceRequest(inputURL), FetchInitiatorInfo());
         if (width > 0) {
             FetchRequest::ResourceWidth resourceWidth;
             resourceWidth.width = width;
             resourceWidth.isSet = true;
             fetchRequest.setResourceWidth(resourceWidth);
         }
         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.
-    RefPtrWillBePersistent<DocumentLoader> documentLoader;
+    RefPtr<DocumentLoader> documentLoader;
     RefPtrWillBePersistent<Document> document;
     FetchContext* fetchContext;
 };
 
 TEST_F(FrameFetchContextHintsTest, MonitorDPRHints)
 {
     expectHeader("http://www.example.com/1.gif", "DPR", false, "");
     ClientHintsPreferences preferences;
     preferences.setShouldSendDPR(true);
     document->setClientHintsPreferences(preferences);
@@ skipping 39 matching lines @@
     preferences.setShouldSendDPR(true);
     preferences.setShouldSendResourceWidth(true);
     preferences.setShouldSendViewportWidth(true);
     document->setClientHintsPreferences(preferences);
     expectHeader("http://www.example.com/1.gif", "DPR", true, "1");
     expectHeader("http://www.example.com/1.gif", "Width", true, "400", 400);
     expectHeader("http://www.example.com/1.gif", "Viewport-Width", true, "500");
 }
 
 } // namespace
+