[subresource_filter] s/ShouldSuppressActivation/OnPageActivationComputed

chrome/browser/subresource_filter/chrome_subresource_filter_client.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 "chrome/browser/subresource_filter/chrome_subresource_filter_client.h"
 
 #include <string>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
@@ skipping 98 matching lines @@
         CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER);
 
     LogAction(kActionUIShown);
     did_show_ui_for_navigation_ = true;
     settings_manager_->OnDidShowUI(top_level_url);
   } else {
     LogAction(kActionNavigationStarted);
   }
 }
 
-bool ChromeSubresourceFilterClient::ShouldSuppressActivation(
-    content::NavigationHandle* navigation_handle) {
+bool ChromeSubresourceFilterClient::OnPageActivationComputed(
+    content::NavigationHandle* navigation_handle,
+    bool activated) {
   const GURL& url(navigation_handle->GetURL());
-  return navigation_handle->IsInMainFrame() &&
+  DCHECK(navigation_handle->IsInMainFrame());
+  // Return whether the activation should be whitelisted.
+  return activated &&
          (whitelisted_hosts_.find(url.host()) != whitelisted_hosts_.end() ||
           settings_manager_->GetSitePermission(url) == CONTENT_SETTING_BLOCK);
 }
 
 void ChromeSubresourceFilterClient::WhitelistByContentSettings(
     const GURL& top_level_url) {
   settings_manager_->WhitelistSite(top_level_url);
 }
 
 void ChromeSubresourceFilterClient::WhitelistInCurrentWebContents(
     const GURL& url) {
   if (url.SchemeIsHTTPOrHTTPS())
     whitelisted_hosts_.insert(url.host());
 }
 
 // static
 void ChromeSubresourceFilterClient::LogAction(SubresourceFilterAction action) {
   UMA_HISTOGRAM_ENUMERATION("SubresourceFilter.Actions", action,
                             kActionLastEntry);
 }
 
 subresource_filter::VerifiedRulesetDealer::Handle*
 ChromeSubresourceFilterClient::GetRulesetDealer() {
   subresource_filter::ContentRulesetService* ruleset_service =
       g_browser_process->subresource_filter_ruleset_service();
   return ruleset_service ? ruleset_service->ruleset_dealer() : nullptr;
 }