Revert of Split BrowsingDataRemoverTest into two tests for Impl and Delegate.

chrome/browser/browsing_data/browsing_data_remover_impl.h

Index: chrome/browser/browsing_data/browsing_data_remover_impl.h
diff --git a/chrome/browser/browsing_data/browsing_data_remover_impl.h b/chrome/browser/browsing_data/browsing_data_remover_impl.h
index 9397d0468b83663676b96b00fa8c7aceac53e929..1e57134576c75e4ecd40e365c438eaa27eeefe16 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_impl.h
+++ b/chrome/browser/browsing_data/browsing_data_remover_impl.h
@@ -147,7 +147,7 @@
 
  private:
   // Testing the private RemovalTask.
-  FRIEND_TEST_ALL_PREFIXES(BrowsingDataRemoverImplTest, MultipleTasks);
+  FRIEND_TEST_ALL_PREFIXES(BrowsingDataRemoverTest, 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
@@ -155,8 +155,7 @@
   // removed.
   //
   // TODO(mkwst): See http://crbug.com/113621
-  friend class BrowsingDataRemoverImplTest;
-  friend class ChromeBrowsingDataRemoverDelegateTest;
+  friend class BrowsingDataRemoverTest;
 
   friend class BrowsingDataRemoverFactory;