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"
@@ skipping 66 matching lines @@
 }
 
 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>);
 }
 
+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::Bind(DontDeleteAnythingFilter<std::string>);

[Bernhard Bauer, 2016/08/18 18:35:59]

If you are stating that this code should never be reached, you don't need to put
in an explicit no-op method here (because that would be handling the failure).
You could just return an empty base::Callback.

[msramek, 2016/08/19 11:16:46]

Done. You're right, this is even against the style guide. Fixed here and above.

+}
+
 bool OriginFilterBuilder::operator==(const OriginFilterBuilder& other) const {
   return origin_list_ == other.origin_list_ && mode() == other.mode();
 }
 
 bool OriginFilterBuilder::IsEmpty() const {
   return origin_list_.empty();
 }
 
 // static
 bool OriginFilterBuilder::MatchesWebsiteSettingsPattern(
     std::vector<ContentSettingsPattern>* origin_patterns,
     Mode mode,
     const ContentSettingsPattern& pattern) {
   for (const ContentSettingsPattern& origin : *origin_patterns) {
     DCHECK(origin.IsValid());
     Relation relation = pattern.Compare(origin);
     if (relation == Relation::IDENTITY)
       return mode == WHITELIST;
   }
   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));
 }