[subresource_filter] Make website setting existence imply site activation

chrome/browser/subresource_filter/subresource_filter_content_settings_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_SUBRESOURCE_FILTER_SUBRESOURCE_FILTER_CONTENT_SETTINGS_MANAGER_H_
 #define CHROME_BROWSER_SUBRESOURCE_FILTER_SUBRESOURCE_FILTER_CONTENT_SETTINGS_MANAGER_H_
 
 #include <memory>
 #include <set>
 #include <string>
@@ skipping 30 matching lines @@
  public:
   explicit SubresourceFilterContentSettingsManager(Profile* profile);
   ~SubresourceFilterContentSettingsManager() override;
 
   ContentSetting GetSitePermission(const GURL& url) const;
 
   // Only called via direct user action on via the subresource filter UI. Sets
   // the content setting to turn off the subresource filter.
   void WhitelistSite(const GURL& url);
 
+  // Public for testing.
+  std::unique_ptr<base::DictionaryValue> GetSiteMetadata(const GURL& url) const;
+
   // Specific logic for more intelligent UI.
   void OnDidShowUI(const GURL& url);
   bool ShouldShowUIForSite(const GURL& url) const;
   bool should_use_smart_ui() const { return should_use_smart_ui_; }
 
+  void ClearSiteMetadata(const GURL& url);
+
   void set_clock_for_testing(std::unique_ptr<base::Clock> tick_clock) {
     clock_ = std::move(tick_clock);
   }
 
   // Time before showing the UI again on a domain.
   // TODO(csharrison): Consider setting this via a finch param.
   static constexpr base::TimeDelta kDelayBeforeShowingInfobarAgain =
       base::TimeDelta::FromMinutes(30);
 
  private:
   // content_settings::Observer:
   void OnContentSettingChanged(const ContentSettingsPattern& primary_pattern,
                                const ContentSettingsPattern& secondary_pattern,
                                ContentSettingsType content_type,
                                std::string resource_identifier) override;
 
   // history::HistoryServiceObserver:
   void OnURLsDeleted(history::HistoryService* history_service,
                      bool all_history,
                      bool expired,
                      const history::URLRows& deleted_rows,
                      const std::set<GURL>& favicon_urls) override;
 
-  std::unique_ptr<base::DictionaryValue> GetSiteMetadata(const GURL& url) const;
   void SetSiteMetadata(const GURL& url,
                        std::unique_ptr<base::DictionaryValue> dict);
 
   ScopedObserver<history::HistoryService, history::HistoryServiceObserver>
       history_observer_;
 
   HostContentSettingsMap* settings_map_;
 
   // A clock is injected into this class so tests can set arbitrary timestamps
   // in website settings.
   std::unique_ptr<base::Clock> clock_;
 
   // Used internally so the class ignores changes to the settings that are not
   // user initiated through the settings UI.
   bool ignore_settings_changes_ = false;
 
   const bool should_use_smart_ui_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(SubresourceFilterContentSettingsManager);
 };
 
 #endif  // CHROME_BROWSER_SUBRESOURCE_FILTER_SUBRESOURCE_FILTER_CONTENT_SETTINGS_MANAGER_H_