[subresource_filter] Make website setting existence imply site activation

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/feature_list.h"
@@ skipping 103 matching lines @@
   } else {
     LogAction(kActionNavigationStarted);
   }
 }
 
 bool ChromeSubresourceFilterClient::OnPageActivationComputed(
     content::NavigationHandle* navigation_handle,
     bool activated) {
   const GURL& url(navigation_handle->GetURL());
   DCHECK(navigation_handle->IsInMainFrame());
+
+  // If the site is no longer activated, clear the metadata. This is to maintain
+  // the invariant that metadata implies activated.
+  if (!activated && url.SchemeIsHTTPOrHTTPS())
+    settings_manager_->ClearSiteMetadata(url);
+
   // Return whether the activation should be whitelisted.
   return whitelisted_hosts_.count(url.host()) ||
          settings_manager_->GetSitePermission(url) == CONTENT_SETTING_BLOCK;
+  // TODO(csharrison): Consider setting the metadata to an empty dict here if
+  // the site is activated and not whitelisted. Need to be careful about various
+  // edge cases like |should_suppress_notification| and DRYRUN activation.
 }
 
 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;
 }