Distinguish between subresource filtering and dryrun matching.

components/subresource_filter/content/renderer/document_subresource_filter_unittest.cc

Index: components/subresource_filter/content/renderer/document_subresource_filter_unittest.cc
diff --git a/components/subresource_filter/content/renderer/document_subresource_filter_unittest.cc b/components/subresource_filter/content/renderer/document_subresource_filter_unittest.cc
index f3e78c7f40e72ae9d326ba971cff2c61395dc0c9..4e4d09a11294869ee720ae99cf32d6a1d8ca2c4c 100644
--- a/components/subresource_filter/content/renderer/document_subresource_filter_unittest.cc
+++ b/components/subresource_filter/content/renderer/document_subresource_filter_unittest.cc
@@ -81,9 +81,12 @@ TEST_F(DocumentSubresourceFilterTest, DryRun) {
   DocumentSubresourceFilter filter(
       ActivationLevel::DRYRUN, true, ruleset(), std::vector<GURL>(),
       first_disallowed_load_callback_receiver.closure());
-  EXPECT_TRUE(filter.allowLoad(GURL(kTestAlphaURL), request_context));
-  EXPECT_TRUE(filter.allowLoad(GURL(kTestAlphaDataURI), request_context));
-  EXPECT_TRUE(filter.allowLoad(GURL(kTestBetaURL), request_context));
+  EXPECT_EQ(blink::WebDocumentSubresourceFilter::AllowWouldFilter,
+            filter.getLoadPolicy(GURL(kTestAlphaURL), request_context));
+  EXPECT_EQ(blink::WebDocumentSubresourceFilter::Allow,
+            filter.getLoadPolicy(GURL(kTestAlphaDataURI), request_context));
+  EXPECT_EQ(blink::WebDocumentSubresourceFilter::Allow,
+            filter.getLoadPolicy(GURL(kTestBetaURL), request_context));
 
   const auto& statistics = filter.statistics();
   EXPECT_EQ(3, statistics.num_loads_total);
@@ -101,9 +104,12 @@ TEST_F(DocumentSubresourceFilterTest, Enabled) {
     DocumentSubresourceFilter filter(ActivationLevel::ENABLED,
                                      measure_performance, ruleset(),
                                      std::vector<GURL>(), base::Closure());
-    EXPECT_FALSE(filter.allowLoad(GURL(kTestAlphaURL), request_context));
-    EXPECT_TRUE(filter.allowLoad(GURL(kTestAlphaDataURI), request_context));
-    EXPECT_TRUE(filter.allowLoad(GURL(kTestBetaURL), request_context));
+    EXPECT_EQ(blink::WebDocumentSubresourceFilter::Filter,
+              filter.getLoadPolicy(GURL(kTestAlphaURL), request_context));
+    EXPECT_EQ(blink::WebDocumentSubresourceFilter::Allow,
+              filter.getLoadPolicy(GURL(kTestAlphaDataURI), request_context));
+    EXPECT_EQ(blink::WebDocumentSubresourceFilter::Allow,
+              filter.getLoadPolicy(GURL(kTestBetaURL), request_context));
 
     const auto& statistics = filter.statistics();
     EXPECT_EQ(3, statistics.num_loads_total);
@@ -125,17 +131,14 @@ TEST_F(DocumentSubresourceFilterTest, Enabled) {
 
 TEST_F(DocumentSubresourceFilterTest,
        CallbackFiredExactlyOnceAfterFirstDisallowedLoad) {
-  blink::WebURLRequest::RequestContext request_context =
-      blink::WebURLRequest::RequestContextImage;
   TestCallbackReceiver first_disallowed_load_callback_receiver;
   DocumentSubresourceFilter filter(
       ActivationLevel::ENABLED, true, ruleset(), std::vector<GURL>(),
       first_disallowed_load_callback_receiver.closure());
-  EXPECT_TRUE(filter.allowLoad(GURL(kTestAlphaDataURI), request_context));
   EXPECT_EQ(0u, first_disallowed_load_callback_receiver.callback_count());
-  EXPECT_FALSE(filter.allowLoad(GURL(kTestAlphaURL), request_context));
+  filter.reportFilteredLoad();
   EXPECT_EQ(1u, first_disallowed_load_callback_receiver.callback_count());
-  EXPECT_FALSE(filter.allowLoad(GURL(kTestAlphaURL), request_context));
+  filter.reportFilteredLoad();
   EXPECT_EQ(1u, first_disallowed_load_callback_receiver.callback_count());
 }