Implement origin-based deletion of plugin data

chrome/browser/browsing_data/origin_filter_builder.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/browsing_data/origin_filter_builder.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 
 using Relation = ContentSettingsPattern::Relation;
 
-namespace {
-
-template<typename T> bool DontDeleteAnythingFilter(const T& data) {
-  return false;
-}
-
-}  // namespace
-
 OriginFilterBuilder::OriginFilterBuilder(Mode mode)
     : BrowsingDataFilterBuilder(mode) {
 }
 
 OriginFilterBuilder::~OriginFilterBuilder() {
 }
 
 void OriginFilterBuilder::AddOrigin(const url::Origin& origin) {
   // TODO(msramek): Optimize OriginFilterBuilder for larger filters if needed.
   DCHECK_LE(origin_list_.size(), 10U) << "OriginFilterBuilder is only suitable "
@@ skipping 34 matching lines @@
 
   return base::Bind(&OriginFilterBuilder::MatchesWebsiteSettingsPattern,
                     base::Owned(patterns_from_origins), mode());
 }
 
 base::Callback<bool(const net::CanonicalCookie& cookie)>
 OriginFilterBuilder::BuildCookieFilter() const {
   NOTREACHED() <<
       "Origin-based deletion is not suitable for cookies. Please use "
       "different scoping, such as RegistrableDomainFilterBuilder.";
-  return base::Bind(DontDeleteAnythingFilter<net::CanonicalCookie>);
+  return base::Callback<bool(const net::CanonicalCookie&)>();
 }
 
 base::Callback<bool(const std::string& channel_id_server_id)>
 OriginFilterBuilder::BuildChannelIDFilter() const {
   NOTREACHED() <<
       "Origin-based deletion is not suitable for channel IDs. Please use "
       "different scoping, such as RegistrableDomainFilterBuilder.";
-  return base::Bind(DontDeleteAnythingFilter<std::string>);
+  return base::Callback<bool(const std::string&)>();
+}
+
+base::Callback<bool(const std::string& site)>
+OriginFilterBuilder::BuildPluginFilter() const {
+  NOTREACHED() <<
+      "Origin-based deletion is not suitable for plugins. Please use "
+      "different scoping, such as RegistrableDomainFilterBuilder.";
+  return base::Callback<bool(const std::string&)>();
 }
 
 bool OriginFilterBuilder::operator==(const OriginFilterBuilder& other) const {
   return origin_list_ == other.origin_list_ && mode() == other.mode();
 }
 
 bool OriginFilterBuilder::IsEmpty() const {
   return origin_list_.empty();
 }
 
@@ skipping 10 matching lines @@
   }
   return mode != WHITELIST;
 }
 
 // static
 bool OriginFilterBuilder::MatchesURL(
     std::set<url::Origin>* origins, Mode mode, const GURL& url) {
   return ((origins->find(url::Origin(url)) != origins->end()) ==
           (mode == WHITELIST));
 }