Consolidate Origin- and RegistrableDomain- FilterBuilder into one class

chrome/browser/browsing_data/browsing_data_remover_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_IMPL_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_IMPL_H_
 
 #include <stdint.h>
 
 #include <queue>
@@ skipping 131 matching lines @@
       const base::Time& delete_end,
       int remove_mask,
       int origin_type_mask,
       std::unique_ptr<BrowsingDataFilterBuilder> filter_builder,
       Observer* observer);
 
  private:
   // Testing the private RemovalTask.
   FRIEND_TEST_ALL_PREFIXES(BrowsingDataRemoverImplTest, MultipleTasks);
 
-  // The BrowsingDataRemover tests need to be able to access the implementation
-  // of Remove(), as it exposes details that aren't yet available in the public
-  // API. As soon as those details are exposed via new methods, this should be
-  // removed.
-  //
-  // TODO(mkwst): See http://crbug.com/113621
-  friend class BrowsingDataRemoverImplTest;
-  friend class ChromeBrowsingDataRemoverDelegateTest;
-
   friend class BrowsingDataRemoverFactory;
 
   // Represents a single removal task. Contains all parameters needed to execute
   // it and a pointer to the observer that added it.
   struct RemovalTask {
     RemovalTask(const base::Time& delete_begin,
                 const base::Time& delete_end,
                 int remove_mask,
                 int origin_type_mask,
                 std::unique_ptr<BrowsingDataFilterBuilder> filter_builder,
@@ skipping 87 matching lines @@
 
   // We do not own this.
   content::StoragePartition* storage_partition_for_testing_ = nullptr;
 
   base::WeakPtrFactory<BrowsingDataRemoverImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemoverImpl);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_IMPL_H_