[subresource_filter] s/ShouldSuppressActivation/OnPageActivationComputed

components/subresource_filter/content/browser/content_subresource_filter_driver_factory.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 "base/feature_list.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/rand_util.h"
@@ skipping 102 matching lines @@
       ActivationLevel::DISABLED)
     return ActivationDecision::ACTIVATION_DISABLED;
 
   if (configurations->the_one_and_only().activation_scope ==
       ActivationScope::NO_SITES)
     return ActivationDecision::ACTIVATION_DISABLED;
 
   if (!url.SchemeIsHTTPOrHTTPS())
     return ActivationDecision::UNSUPPORTED_SCHEME;
 
-  if (client_->ShouldSuppressActivation(navigation_handle))
-    return ActivationDecision::URL_WHITELISTED;
-
   switch (configurations->the_one_and_only().activation_scope) {
     case ActivationScope::ALL_SITES:
       return ActivationDecision::ACTIVATED;
     case ActivationScope::ACTIVATION_LIST: {
       // The logic to ensure only http/https URLs are activated lives in
       // AddActivationListMatch to ensure the activation list only has relevant
       // entries.
       DCHECK(url.SchemeIsHTTPOrHTTPS() ||
              !DidURLMatchActivationList(
                  url, configurations->the_one_and_only().activation_list));
@@ skipping 46 matching lines @@
 
   const auto configurations = GetActiveConfigurations();
   if (configurations->the_one_and_only().should_whitelist_site_on_reload &&
       NavigationIsPageReload(url, referrer, transition)) {
     // Whitelist this host for the current as well as subsequent navigations.
     client_->WhitelistInCurrentWebContents(url);
   }
 
   activation_decision_ =
       ComputeActivationDecisionForMainFrameNavigation(navigation_handle);
+
+  // Check for the whitelisted status last, so that the client gets an accurate
+  // indication of whether there would be activation otherwise.
+  bool whitelisted = client_->OnPageActivationComputed(
+      navigation_handle, activation_decision_ == ActivationDecision::ACTIVATED);
+  if (whitelisted)
+    activation_decision_ = ActivationDecision::URL_WHITELISTED;
   DCHECK(activation_decision_ != ActivationDecision::UNKNOWN);
   if (activation_decision_ != ActivationDecision::ACTIVATED) {
     ResetActivationState();
     return;
   }
 
   activation_level_ = configurations->the_one_and_only().activation_level;
   measure_performance_ =
       activation_level_ != ActivationLevel::DISABLED &&
       ShouldMeasurePerformanceForPageLoad(
@@ skipping 115 matching lines @@
       REPORT_REDIRECT_PATTERN_FOR_SUFFIX("SubresourceFilterOnly", hits_pattern,
                                          chain_size);
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace subresource_filter