[subresource_filter] s/ShouldSuppressActivation/OnPageActivationComputed

components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.cc

 // Copyright 2016 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/content_subresource_filter_driver_factory.h"
 
 #include <set>
 #include <string>
 
 #include "base/macros.h"
@@ skipping 171 matching lines @@
     {ActivationDecision::ACTIVATION_DISABLED, ActivationLevel::DISABLED},
 };
 
 class MockSubresourceFilterClient : public SubresourceFilterClient {
  public:
   MockSubresourceFilterClient(VerifiedRulesetDealer::Handle* ruleset_dealer)
       : ruleset_dealer_(ruleset_dealer) {}
 
   ~MockSubresourceFilterClient() override = default;
 
-  bool ShouldSuppressActivation(content::NavigationHandle* handle) override {
-    return handle->IsInMainFrame() &&
-           whitelisted_hosts_.find(handle->GetURL().host()) !=
-               whitelisted_hosts_.end();
+  bool OnPageActivationComputed(content::NavigationHandle* handle,
+                                bool activated) override {
+    DCHECK(handle->IsInMainFrame());
+    return activated && whitelisted_hosts_.find(handle->GetURL().host()) !=
+                            whitelisted_hosts_.end();

[shivanisha, 2017/05/10 17:34:25]

nit (for sake of conciseness):
 
return activated && whitelisted_hosts_.count(handle->GetURL().host()) != 0;

[engedy, 2017/05/10 17:40:20]

Actually, I just discovered there is base::ContainsValue(...) which does exactly
this (and also terminates after the first match).

[Charlie Harrison, 2017/05/10 18:17:21]

Changed to use base::ContainsValue, but it's a set so count() will also
terminate after the first match.

   }
 
   void WhitelistByContentSettings(const GURL& url) override {}
   void WhitelistInCurrentWebContents(const GURL& url) override {
     if (url.SchemeIsHTTPOrHTTPS())
       whitelisted_hosts_.insert(url.host());
   }
 
   VerifiedRulesetDealer::Handle* GetRulesetDealer() override {
     return ruleset_dealer_;
@@ skipping 655 matching lines @@
     ActivationScopeTest,
     ContentSubresourceFilterDriverFactoryActivationScopeTest,
     ::testing::ValuesIn(kActivationScopeTestData));
 
 INSTANTIATE_TEST_CASE_P(
     ActivationLevelTest,
     ContentSubresourceFilterDriverFactoryActivationLevelTest,
     ::testing::ValuesIn(kActivationLevelTestData));
 
 }  // namespace subresource_filter