Moves shared history test helpers into util classes.

components/history/core/browser/history_service.h

Index: components/history/core/browser/history_service.h
diff --git a/components/history/core/browser/history_service.h b/components/history/core/browser/history_service.h
index 1cf28128c7fa3168859e44732aec197cdd1d454a..91bb0d43978a6f25c344f123b34c9b0558d18bbf 100644
--- a/components/history/core/browser/history_service.h
+++ b/components/history/core/browser/history_service.h
@@ -581,10 +581,15 @@ class HistoryService : public syncer::SyncableService, public KeyedService {
   friend class ::HistoryQuickProviderTest;
   friend class HistoryServiceTest;
   friend class ::HistoryURLProvider;
-  friend class ::HistoryURLProviderTest;
   friend class ::InMemoryURLIndexTest;
   friend class ::SyncBookmarkDataTypeControllerTest;
   friend class ::TestingProfile;
+  friend void BlockUntilHistoryProcessesPendingRequests(

[Peter Kasting, 2016/01/31 20:30:43]

I don't think this needs to be a friend?  Looks like it just calls
ScheduleDBTask(), which is public.

[rohitrao (ping after 24h), 2016/02/01 12:46:47]

For some reason I looked at that method and decided it was private.  Fixed.

+      HistoryService* history_service);
+  friend scoped_ptr<HistoryService> CreateHistoryService(
+      const base::FilePath& history_dir,
+      const std::string& accept_languages,
+      bool create_db);
 
   // Called on shutdown, this will tell the history backend to complete and
   // will release pointers to it. No other functions should be called once