[subresource_filter] Reland: Remove Forwarding NavigationThrottles

components/subresource_filter/content/browser/subresource_filter_safe_browsing_activation_throttle_unittest.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/subresource_filter/content/browser/subresource_filter_safe_browsing_activation_throttle.h"
 
 #include <memory>
 #include <tuple>
 #include <utility>
 
@@ skipping 64 matching lines @@
   MOCK_METHOD2(OnPageActivationComputed,
                bool(content::NavigationHandle*, bool));
   MOCK_METHOD1(WhitelistByContentSettings, void(const GURL&));
   MOCK_METHOD1(WhitelistInCurrentWebContents, void(const GURL&));
   MOCK_METHOD0(GetRulesetDealer, VerifiedRulesetDealer::Handle*());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockSubresourceFilterClient);
 };
 
-// Throttle to call WillProcessResponse on the factory, which is otherwise
-// called by the ThrottleManager.
-class TestForwardingNavigationThrottle : public content::NavigationThrottle {
- public:
-  explicit TestForwardingNavigationThrottle(content::NavigationHandle* handle)
-      : content::NavigationThrottle(handle) {}
-  ~TestForwardingNavigationThrottle() override {}
-
-  // content::NavigationThrottle:
-  content::NavigationThrottle::ThrottleCheckResult WillProcessResponse()
-      override {
-    content::WebContents* web_contents = navigation_handle()->GetWebContents();
-    ContentSubresourceFilterDriverFactory* factory =
-        ContentSubresourceFilterDriverFactory::FromWebContents(web_contents);
-    factory->WillProcessResponse(navigation_handle());
-    return content::NavigationThrottle::PROCEED;
-  }
-  const char* GetNameForLogging() override {
-    return "TestForwardingNavigationThrottle";
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(TestForwardingNavigationThrottle);
-};
-
 std::string GetSuffixForList(const ActivationList& type) {
   switch (type) {
     case ActivationList::SOCIAL_ENG_ADS_INTERSTITIAL:
       return "SocialEngineeringAdsInterstitial";
     case ActivationList::PHISHING_INTERSTITIAL:
       return "PhishingInterstitial";
     case ActivationList::SUBRESOURCE_FILTER:
       return "SubresourceFilterOnly";
     case ActivationList::NONE:
       return std::string();
@@ skipping 71 matching lines @@
   }
 
   // content::WebContentsObserver:
   void DidStartNavigation(
       content::NavigationHandle* navigation_handle) override {
     ASSERT_TRUE(navigation_handle->IsInMainFrame());
     navigation_handle->RegisterThrottleForTesting(
         base::MakeUnique<SubresourceFilterSafeBrowsingActivationThrottle>(
             navigation_handle, test_io_task_runner_,
             fake_safe_browsing_database_));
-    navigation_handle->RegisterThrottleForTesting(
-        base::MakeUnique<TestForwardingNavigationThrottle>(navigation_handle));
   }
 
   content::NavigationThrottle::ThrottleCheckResult SimulateStart() {
     navigation_simulator_->Start();
     auto result = navigation_simulator_->GetLastThrottleCheckResult();
     if (result == content::NavigationThrottle::CANCEL)
       navigation_simulator_.reset();
     return result;
   }
 
@@ skipping 48 matching lines @@
     fake_safe_browsing_database_->AddBlacklistedUrl(url, pattern_type,
                                                     metadata);
   }
 
   void SimulateTimeout() { fake_safe_browsing_database_->SimulateTimeout(); }
 
   void ClearAllBlacklistedUrls() {
     fake_safe_browsing_database_->RemoveAllBlacklistedUrls();
   }
 
+  // With a null database the throttle becomes pass-through.
+  void UsePassThroughThrottle() { fake_safe_browsing_database_ = nullptr; }
+
   void RunUntilIdle() {
     test_io_task_runner_->RunUntilIdle();
     base::RunLoop().RunUntilIdle();
   }
 
   const base::HistogramTester& tester() const { return tester_; }
 
   base::TestMockTimeTaskRunner* test_io_task_runner() const {
     return test_io_task_runner_.get();
   }
@@ skipping 68 matching lines @@
   }
 
  private:
   content::CancellingNavigationThrottle::CancelTime cancel_time_;
   content::CancellingNavigationThrottle::ResultSynchrony result_sync_;
 
   DISALLOW_COPY_AND_ASSIGN(
       SubresourceFilterSafeBrowsingActivationThrottleTestWithCancelling);
 };
 
+TEST_F(SubresourceFilterSafeBrowsingActivationThrottleTest,
+       PassThroughThrottle) {
+  UsePassThroughThrottle();
+  CreateTestNavigationForMainFrame(GURL(kURL));
+  SimulateStartAndExpectProceed();
+  SimulateRedirectAndExpectProceed(GURL(kRedirectURL));
+  SimulateCommitAndExpectProceed();
+  EXPECT_EQ(ActivationDecision::ACTIVATION_CONDITIONS_NOT_MET,
+            factory()->GetActivationDecisionForLastCommittedPageLoad());
+
+  scoped_configuration()->ResetConfiguration(
+      Configuration(ActivationLevel::ENABLED, ActivationScope::ALL_SITES));
+  CreateTestNavigationForMainFrame(GURL(kURL));
+  SimulateStartAndExpectProceed();
+  SimulateRedirectAndExpectProceed(GURL(kRedirectURL));
+  SimulateCommitAndExpectProceed();
+  EXPECT_EQ(ActivationDecision::ACTIVATED,
+            factory()->GetActivationDecisionForLastCommittedPageLoad());
+
+  scoped_configuration()->ResetConfiguration(
+      Configuration(ActivationLevel::ENABLED, ActivationScope::NO_SITES));
+  CreateTestNavigationForMainFrame(GURL(kURL));
+  SimulateStartAndExpectProceed();
+  SimulateRedirectAndExpectProceed(GURL(kRedirectURL));
+  SimulateCommitAndExpectProceed();
+  EXPECT_EQ(ActivationDecision::ACTIVATION_CONDITIONS_NOT_MET,
+            factory()->GetActivationDecisionForLastCommittedPageLoad());
+}
+
 TEST_P(SubresourceFilterSafeBrowsingActivationThrottleParamTest,
        ListNotMatched_NoActivation) {
   const ActivationListTestData& test_data = GetParam();
   const GURL url(kURL);
   const std::string suffix(GetSuffixForList(test_data.activation_list_type));
   CreateTestNavigationForMainFrame(url);
   SimulateStartAndExpectProceed();
   SimulateCommitAndExpectProceed();
   EXPECT_EQ(ActivationDecision::ACTIVATION_CONDITIONS_NOT_MET,
             factory()->GetActivationDecisionForLastCommittedPageLoad());
@@ skipping 276 matching lines @@
         ::testing::Values(
             content::CancellingNavigationThrottle::SYNCHRONOUS,
             content::CancellingNavigationThrottle::ASYNCHRONOUS)));
 
 INSTANTIATE_TEST_CASE_P(
     ActivationLevelTest,
     SubresourceFilterSafeBrowsingActivationThrottleParamTest,
     ::testing::ValuesIn(kActivationListTestData));
 
 }  // namespace subresource_filter