Consolidate Origin- and RegistrableDomain- FilterBuilder into one class

chrome/browser/browsing_data/origin_filter_builder.cc

Index: chrome/browser/browsing_data/origin_filter_builder.cc
diff --git a/chrome/browser/browsing_data/origin_filter_builder.cc b/chrome/browser/browsing_data/origin_filter_builder.cc
deleted file mode 100644
index b0198702489a896977c8e42659b5f35fb2389962..0000000000000000000000000000000000000000
--- a/chrome/browser/browsing_data/origin_filter_builder.cc
+++ /dev/null
@@ -1,81 +0,0 @@
-// 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"
-
-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 "
-                                         "for creating small filters.";
-
-  // By limiting the filter to non-unique origins, we can guarantee that
-  // origin1 < origin2 && origin1 > origin2 <=> origin1.isSameOrigin(origin2).
-  // This means that std::set::find() will use the same semantics for
-  // origin comparison as Origin::IsSameOriginWith(). Furthermore, this
-  // means that two filters are equal iff they are equal element-wise.
-  DCHECK(!origin.unique()) << "Invalid origin passed into OriginFilter.";
-
-  // TODO(msramek): All urls with file scheme currently map to the same
-  // origin. This is currently not a problem, but if it becomes one,
-  // consider recognizing the URL path.
-
-  origin_list_.insert(origin);
-}
-
-base::Callback<bool(const GURL&)>
-    OriginFilterBuilder::BuildGeneralFilter() const {
-  std::set<url::Origin>* origins = new std::set<url::Origin>(origin_list_);
-  return base::Bind(&OriginFilterBuilder::MatchesURL,
-                    base::Owned(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::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::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();
-}
-
-// static
-bool OriginFilterBuilder::MatchesURL(
-    std::set<url::Origin>* origins, Mode mode, const GURL& url) {
-  return ((origins->find(url::Origin(url)) != origins->end()) ==
-          (mode == WHITELIST));
-}