Chromium Code Reviews| Index: Source/core/loader/FrameFetchContextTest.cpp |
| diff --git a/Source/core/loader/FrameFetchContextTest.cpp b/Source/core/loader/FrameFetchContextTest.cpp |
| index c6ce4a080ef08c5919cc5ce2b32ba1d250ba4b97..542e6489a9d9972040e1a84ccaf9e5d6bb78ab5d 100644 |
| --- a/Source/core/loader/FrameFetchContextTest.cpp |
| +++ b/Source/core/loader/FrameFetchContextTest.cpp |
| @@ -61,6 +61,7 @@ public: |
| } |
| Frame* parent() const override { return m_parent.get(); } |
| + Frame* top() const override { return m_parent.get(); } |
|
Bryan McQuade
2015/09/04 16:40:28
looks like this isn't used - can it be removed?
Nate Chapin
2015/09/04 21:52:32
Done.
|
| private: |
| explicit StubFrameLoaderClientWithParent(Frame* parent) |
| @@ -426,7 +427,6 @@ TEST_F(FrameFetchContextTest, ModifyPriorityForExperiments) |
| settings->setFEtchIncreaseFontPriority(false); |
| settings->setFEtchDeferLateScripts(false); |
| settings->setFEtchIncreasePriorities(false); |
| - settings->setLowPriorityIframes(false); |
| // Base case, no priority change. Note that this triggers m_imageFetched, which will matter for setFetchDeferLateScripts() case below. |
| EXPECT_EQ(ResourceLoadPriorityLow, fetchContext->modifyPriorityForExperiments(ResourceLoadPriorityLow, Resource::Image, request)); |
| @@ -474,12 +474,6 @@ TEST_F(FrameFetchContextTest, ModifyPriorityForExperiments) |
| settings->setFEtchIncreaseAsyncScriptPriority(true); |
| EXPECT_EQ(ResourceLoadPriorityMedium, fetchContext->modifyPriorityForExperiments(ResourceLoadPriorityMedium, Resource::Script, deferredRequest)); |
| - // Set up a child frame, test main resource load with and without setLowPriorityIframes() |
| - FrameFetchContext* childFetchContext = createChildFrame(); |
| - EXPECT_EQ(ResourceLoadPriorityVeryHigh, childFetchContext->modifyPriorityForExperiments(ResourceLoadPriorityVeryHigh, Resource::MainResource, request)); |
| - settings->setLowPriorityIframes(true); |
| - EXPECT_EQ(ResourceLoadPriorityVeryLow, childFetchContext->modifyPriorityForExperiments(ResourceLoadPriorityVeryHigh, Resource::MainResource, request)); |
| - |
| // Ensure we don't go out of bounds |
| settings->setFEtchIncreasePriorities(true); |
| EXPECT_EQ(ResourceLoadPriorityVeryHigh, fetchContext->modifyPriorityForExperiments(ResourceLoadPriorityVeryHigh, Resource::Script, request)); |
| @@ -488,4 +482,21 @@ TEST_F(FrameFetchContextTest, ModifyPriorityForExperiments) |
| EXPECT_EQ(ResourceLoadPriorityVeryLow, fetchContext->modifyPriorityForExperiments(ResourceLoadPriorityVeryLow, Resource::Script, preloadRequest)); |
| } |
| +TEST_F(FrameFetchContextTest, ModifyPriorityForLowPriorityIframes) |
| +{ |
| + Settings* settings = document->frame()->settings(); |
| + settings->setLowPriorityIframes(false); |
| + FetchRequest request(ResourceRequest("http://www.example.com"), FetchInitiatorInfo()); |
| + FrameFetchContext* childFetchContext = createChildFrame(); |
| + |
| + // No low priority iframes, expect default values. |
| + EXPECT_EQ(ResourceLoadPriorityVeryHigh, childFetchContext->modifyPriorityForExperiments(ResourceLoadPriorityVeryHigh, Resource::MainResource, request)); |
| + EXPECT_EQ(ResourceLoadPriorityMedium, childFetchContext->modifyPriorityForExperiments(ResourceLoadPriorityMedium, Resource::Script, request)); |
| + |
| + // Low priority iframes enabled, everything should be low priority |
| + settings->setLowPriorityIframes(true); |
| + EXPECT_EQ(ResourceLoadPriorityVeryLow, childFetchContext->modifyPriorityForExperiments(ResourceLoadPriorityVeryHigh, Resource::MainResource, request)); |
| + EXPECT_EQ(ResourceLoadPriorityVeryLow, childFetchContext->modifyPriorityForExperiments(ResourceLoadPriorityMedium, Resource::Script, request)); |
| +} |
| + |
| } // namespace |