Add an OriginFilterBuilder class for [white|black]listing origins.

chrome/browser/browsing_data/browsing_data_remover_unittest.cc

Index: chrome/browser/browsing_data/browsing_data_remover_unittest.cc
diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
index 9a824c451912b984f3ebd83924185826d54a678d..378d593044f9bbc09d84376d04cbf8082046aa4b 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
@@ -74,6 +74,7 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/favicon_size.h"
 #include "url/origin.h"
+#include "url/origin_filter.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/users/mock_user_manager.h"
@@ -259,34 +260,36 @@ class TestStoragePartition : public StoragePartition {
   DISALLOW_COPY_AND_ASSIGN(TestStoragePartition);
 };
 
-// Custom matcher to verify is-same-origin relationship to given reference
-// origin.
-// (We cannot use equality-based matching because operator== is not defined for
-// Origin, and we in fact want to rely on IsSameOrigin for matching purposes.)
-class SameOriginMatcher : public MatcherInterface<const url::Origin&> {
+// Custom matcher to verify the equivalence of two origin filters.
+class FilterMatcher : public MatcherInterface<const url::OriginFilter*> {
  public:
-  explicit SameOriginMatcher(const url::Origin& reference)
-      : reference_(reference) {}
+  explicit FilterMatcher(const url::OriginFilter* filter) : to_match_(filter) {
+  }
 
-  virtual bool MatchAndExplain(const url::Origin& origin,
+  virtual bool MatchAndExplain(const url::OriginFilter* filter,
                                MatchResultListener* listener) const {
-    return reference_.IsSameOriginWith(origin);
+    if (!filter) {
+      *listener << "which is NULL.";
+      return false;
+    }
+    return *filter == *to_match_;
   }
 
   virtual void DescribeTo(::std::ostream* os) const {
-    *os << "is same origin with " << reference_;
+    *os << "is equal to " << *to_match_;
   }
 
   virtual void DescribeNegationTo(::std::ostream* os) const {
-    *os << "is not same origin with " << reference_;
+    *os << "is not equal to " << *to_match_;
   }
 
  private:
-  const url::Origin& reference_;
+  const url::OriginFilter* to_match_;
 };
 
-inline Matcher<const url::Origin&> SameOrigin(const url::Origin& reference) {
-  return MakeMatcher(new SameOriginMatcher(reference));
+inline Matcher<const url::OriginFilter*> SameFilter(
+    const url::OriginFilter* filter) {
+  return MakeMatcher(new FilterMatcher(filter));
 }
 
 }  // namespace
@@ -2146,11 +2149,15 @@ TEST_F(BrowsingDataRemoverTest, DISABLED_DomainReliability_NoMonitor) {
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveSameOriginDownloads) {
+  std::vector<url::Origin> whitelist;
+  whitelist.push_back(url::Origin(kOrigin1));
+  scoped_ptr<url::OriginFilter> filter =
+      url::OriginFilter::AsWhitelist(whitelist);
   RemoveDownloadsTester tester(GetProfile());
-  const url::Origin expectedOrigin(kOrigin1);
 
-  EXPECT_CALL(*tester.download_manager(),
-              RemoveDownloadsByOriginAndTime(SameOrigin(expectedOrigin), _, _));
+  EXPECT_CALL(
+      *tester.download_manager(),
+      RemoveDownloadsByOriginAndTime(SameFilter(filter.get()), _, _));
 
   BlockUntilOriginDataRemoved(BrowsingDataRemover::EVERYTHING,
                               BrowsingDataRemover::REMOVE_DOWNLOADS, kOrigin1);