| Index: third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp b/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
|
| index 3f78de43b237ed18a0ef784352798895cfc797bc..a3cf91d4745c68a2e27a829c44f6cd14e41dcdba 100644
|
| --- a/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
|
| @@ -50,6 +50,7 @@
|
| #include "public/platform/WebAddressSpace.h"
|
| #include "public/platform/WebCachePolicy.h"
|
| #include "public/platform/WebDocumentSubresourceFilter.h"
|
| +#include "public/platform/WebDocumentSubresourceFilterLoadPolicy.h"
|
| #include "public/platform/WebInsecureRequestPolicy.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -85,18 +86,20 @@ class MockFrameLoaderClient : public EmptyFrameLoaderClient {
|
|
|
| class FixedPolicySubresourceFilter : public WebDocumentSubresourceFilter {
|
| public:
|
| - FixedPolicySubresourceFilter(LoadPolicy policy, int* filteredLoadCounter)
|
| + FixedPolicySubresourceFilter(WebDocumentSubresourceFilterLoadPolicy policy,
|
| + int* filteredLoadCounter)
|
| : m_policy(policy), m_filteredLoadCounter(filteredLoadCounter) {}
|
|
|
| - LoadPolicy getLoadPolicy(const WebURL& resourceUrl,
|
| - WebURLRequest::RequestContext) override {
|
| + WebDocumentSubresourceFilterLoadPolicy getLoadPolicy(
|
| + const WebURL& resourceUrl,
|
| + WebURLRequest::RequestContext) override {
|
| return m_policy;
|
| }
|
|
|
| void reportDisallowedLoad() override { ++*m_filteredLoadCounter; }
|
|
|
| private:
|
| - const LoadPolicy m_policy;
|
| + const WebDocumentSubresourceFilterLoadPolicy m_policy;
|
| int* m_filteredLoadCounter;
|
| };
|
|
|
| @@ -158,7 +161,7 @@ class FrameFetchContextSubresourceFilterTest : public FrameFetchContextTest {
|
|
|
| int getFilteredLoadCallCount() const { return m_filteredLoadCallbackCounter; }
|
|
|
| - void setFilterPolicy(WebDocumentSubresourceFilter::LoadPolicy policy) {
|
| + void setFilterPolicy(WebDocumentSubresourceFilterLoadPolicy policy) {
|
| document->loader()->setSubresourceFilter(
|
| WTF::makeUnique<FixedPolicySubresourceFilter>(
|
| policy, &m_filteredLoadCallbackCounter));
|
| @@ -871,7 +874,7 @@ TEST_F(FrameFetchContextTest, SetIsExternalRequestForLocalDocument) {
|
| }
|
|
|
| TEST_F(FrameFetchContextSubresourceFilterTest, Filter) {
|
| - setFilterPolicy(WebDocumentSubresourceFilter::Disallow);
|
| + setFilterPolicy(WebDocumentSubresourceFilterLoadPolicy::Disallow);
|
|
|
| EXPECT_EQ(ResourceRequestBlockedReason::SubresourceFilter, canRequest());
|
| EXPECT_EQ(1, getFilteredLoadCallCount());
|
| @@ -888,7 +891,7 @@ TEST_F(FrameFetchContextSubresourceFilterTest, Filter) {
|
| }
|
|
|
| TEST_F(FrameFetchContextSubresourceFilterTest, Allow) {
|
| - setFilterPolicy(WebDocumentSubresourceFilter::Allow);
|
| + setFilterPolicy(WebDocumentSubresourceFilterLoadPolicy::Allow);
|
|
|
| EXPECT_EQ(ResourceRequestBlockedReason::None, canRequest());
|
| EXPECT_EQ(0, getFilteredLoadCallCount());
|
| @@ -898,7 +901,7 @@ TEST_F(FrameFetchContextSubresourceFilterTest, Allow) {
|
| }
|
|
|
| TEST_F(FrameFetchContextSubresourceFilterTest, WouldDisallow) {
|
| - setFilterPolicy(WebDocumentSubresourceFilter::WouldDisallow);
|
| + setFilterPolicy(WebDocumentSubresourceFilterLoadPolicy::WouldDisallow);
|
|
|
| EXPECT_EQ(ResourceRequestBlockedReason::None, canRequest());
|
| EXPECT_EQ(0, getFilteredLoadCallCount());
|
|
|