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

chrome/browser/browsing_data/browsing_data_remover_unittest.cc

 // Copyright (c) 2012 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/browsing_data_remover.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <set>
@@ skipping 56 matching lines @@
 #include "net/ssl/channel_id_service.h"
 #include "net/ssl/channel_id_store.h"
 #include "net/ssl/ssl_client_cert_type.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #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"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/mock_cryptohome_client.h"
 #include "components/signin/core/account_id/account_id.h"
 #endif
@@ skipping 165 matching lines @@
  private:
   void AsyncRunCallback(const base::Closure& callback) {
     callback.Run();
   }
 
   StoragePartitionRemovalData storage_partition_removal_data_;
 
   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
 
 // Testers -------------------------------------------------------------------
 
 class RemoveCookieTester {
  public:
   RemoveCookieTester() {}
 
@@ skipping 1839 matching lines @@
 // for some unrelated test cases. This should be fixed so it tests the no-
 // monitor case again.
 TEST_F(BrowsingDataRemoverTest, DISABLED_DomainReliability_NoMonitor) {
   BlockUntilBrowsingDataRemoved(
       BrowsingDataRemover::EVERYTHING,
       BrowsingDataRemover::REMOVE_HISTORY |
       BrowsingDataRemover::REMOVE_COOKIES, false);
 }
 
 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);
 }
 
 TEST_F(BrowsingDataRemoverTest, RemovePasswordStatistics) {
   PasswordStoreFactory::GetInstance()->SetTestingFactoryAndUse(
       GetProfile(),
       password_manager::BuildPasswordStore<
           content::BrowserContext, password_manager::MockPasswordStore>);
   password_manager::MockPasswordStore* store =
       static_cast<password_manager::MockPasswordStore*>(
           PasswordStoreFactory::GetInstance()
               ->GetForProfile(GetProfile(), ServiceAccessType::EXPLICIT_ACCESS)
               .get());
   EXPECT_CALL(*store, RemoveStatisticsCreatedBetweenImpl(base::Time(),
                                                          base::Time::Max()));
   BlockUntilBrowsingDataRemoved(
       BrowsingDataRemover::EVERYTHING,
       BrowsingDataRemover::REMOVE_HISTORY, false);
 }