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..033cebe13f169ee4b4bf6e90614746191db968e1 100644
--- a/components/history/core/browser/history_service.h
+++ b/components/history/core/browser/history_service.h
@@ -42,11 +42,17 @@ class GURL;
 class HistoryQuickProviderTest;
 class HistoryURLProvider;
 class HistoryURLProviderTest;
+class InMemoryURLIndex;
 class InMemoryURLIndexTest;
 class SkBitmap;
 class SyncBookmarkDataTypeControllerTest;
 class TestingProfile;
 
+// Forward-declare functions that will be friended by HistoryService.
+void BlockUntilInMemoryURLIndexIsRefreshed(InMemoryURLIndex* index);
+void RebuildInMemoryURLIndex(InMemoryURLIndex* index,
+                             history::HistoryService* history);
+
 namespace base {
 class FilePath;
 class Thread;
@@ -581,10 +587,18 @@ 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(
+      HistoryService* history_service);
+  friend scoped_ptr<HistoryService> CreateHistoryService(
+      const base::FilePath& history_dir,
+      const std::string& accept_languages,
+      bool create_db);
+  friend void ::BlockUntilInMemoryURLIndexIsRefreshed(InMemoryURLIndex* index);
+  friend void ::RebuildInMemoryURLIndex(InMemoryURLIndex* index,
+                                        history::HistoryService* history);
 
   // Called on shutdown, this will tell the history backend to complete and
   // will release pointers to it. No other functions should be called once