Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1050)

Unified Diff: Source/core/loader/FrameFetchContextTest.cpp

Issue 1194003004: Oilpan: enable appcache + move DocumentLoader to the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebased Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/loader/EmptyClients.cpp ('k') | Source/core/loader/FrameLoader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/FrameFetchContextTest.cpp
diff --git a/Source/core/loader/FrameFetchContextTest.cpp b/Source/core/loader/FrameFetchContextTest.cpp
index d18df401db0925b019fbfc8cba363ac263c5025c..9613a23ac79d43e8be5ef8b1db43a34b07a9aa62 100644
--- a/Source/core/loader/FrameFetchContextTest.cpp
+++ b/Source/core/loader/FrameFetchContextTest.cpp
@@ -63,6 +63,12 @@ protected:
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);
@@ -108,7 +114,7 @@ protected:
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<DocumentLoader> documentLoader;
RefPtrWillBePersistent<Document> document;
FetchContext* fetchContext;
};
@@ -230,6 +236,12 @@ protected:
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);
@@ -249,7 +261,7 @@ protected:
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<DocumentLoader> documentLoader;
RefPtrWillBePersistent<Document> document;
FetchContext* fetchContext;
};
@@ -309,4 +321,3 @@ TEST_F(FrameFetchContextHintsTest, MonitorAllHints)
}
} // namespace
-
« no previous file with comments | « Source/core/loader/EmptyClients.cpp ('k') | Source/core/loader/FrameLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698