| Index: Source/core/loader/FrameFetchContextTest.cpp
|
| diff --git a/Source/core/loader/FrameFetchContextTest.cpp b/Source/core/loader/FrameFetchContextTest.cpp
|
| index 9613a23ac79d43e8be5ef8b1db43a34b07a9aa62..d18df401db0925b019fbfc8cba363ac263c5025c 100644
|
| --- a/Source/core/loader/FrameFetchContextTest.cpp
|
| +++ b/Source/core/loader/FrameFetchContextTest.cpp
|
| @@ -63,12 +63,6 @@
|
| 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);
|
| @@ -114,7 +108,7 @@
|
| 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;
|
| };
|
| @@ -236,12 +230,6 @@
|
| 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);
|
| @@ -261,7 +249,7 @@
|
| 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;
|
| };
|
| @@ -321,3 +309,4 @@
|
| }
|
|
|
| } // namespace
|
| +
|
|
|