Moves shared history test helpers into util classes.

components/history/core/browser/history_service.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 COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_SERVICE_H_
 #define COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_SERVICE_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 563 matching lines @@
  private:
   class BackendDelegate;
   friend class base::RefCountedThreadSafe<HistoryService>;
   friend class BackendDelegate;
   friend class favicon::FaviconService;
   friend class HistoryBackend;
   friend class HistoryQueryTest;
   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
   // cleanup has happened that may dispatch to the history thread (because it
   // will be null).
   //
   // In practice, this will be called by the service manager (BrowserProcess)
   // when it is being destroyed. Because that reference is being destroyed, it
   // should be impossible for anybody else to call the service, even if it is
   // still in memory (pending requests may be holding a reference to us).
@@ skipping 266 matching lines @@
 
   // All vended weak pointers are invalidated in Cleanup().
   base::WeakPtrFactory<HistoryService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryService);
 };
 
 }  // namespace history
 
 #endif  // COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_SERVICE_H_