Remove dependency of HistoryService on WebHistoryServiceFactory

chrome/browser/history/history_service.h

Index: chrome/browser/history/history_service.h
diff --git a/chrome/browser/history/history_service.h b/chrome/browser/history/history_service.h
index 7a6535ae61db98369a7e535838943201675415ad..2498761759cb136c42c39b1f341142bf9847569a 100644
--- a/chrome/browser/history/history_service.h
+++ b/chrome/browser/history/history_service.h
@@ -39,10 +39,11 @@ class AndroidHistoryProviderService;
 #endif
 
 class GURL;
+class HistoryService;
+struct ImportedFaviconUsage;
 class PageUsageData;
 class PageUsageRequest;
 class Profile;
-struct ImportedFaviconUsage;
 class SkBitmap;
 
 namespace base {
@@ -56,22 +57,31 @@ class VisitedLinkMaster;
 
 namespace history {
 
+struct DownloadRow;
+struct HistoryAddPageArgs;
 class HistoryBackend;
 class HistoryClient;
+class HistoryDBTask;
 class HistoryDatabase;
 struct HistoryDatabaseParams;
-class HistoryDBTask;
 class HistoryQueryTest;
 class HistoryServiceObserver;
 class HistoryTest;
 class InMemoryHistoryBackend;
 class InMemoryURLIndex;
 class InMemoryURLIndexTest;
+struct KeywordSearchTermVisit;
 class URLDatabase;
 class VisitFilter;
-struct DownloadRow;
-struct HistoryAddPageArgs;
-struct KeywordSearchTermVisit;
+class WebHistoryService;
+
+void ExpireLocalAndRemoteHistoryBetween(HistoryService* local_history,

[droger, 2015/02/05 16:16:13]

This looks like a mistake, the function is also declared in history_util.

+                                        WebHistoryService* web_history,
+                                        const std::set<GURL>& restrict_urls,
+                                        base::Time begin_time,
+                                        base::Time end_time,
+                                        const base::Closure& callback,
+                                        base::CancelableTaskTracker* tracker);
 
 }  // namespace history
 
@@ -351,15 +361,6 @@ class HistoryService : public syncer::SyncableService,
                      const base::Closure& callback,
                      base::CancelableTaskTracker* tracker);
 
-  // Removes all visits to the given URLs in the specified time range. Calls
-  // ExpireHistoryBetween() to delete local visits, and handles deletion of
-  // synced visits if appropriate.
-  void ExpireLocalAndRemoteHistoryBetween(const std::set<GURL>& restrict_urls,
-                                          base::Time begin_time,
-                                          base::Time end_time,
-                                          const base::Closure& callback,
-                                          base::CancelableTaskTracker* tracker);
-
   // Processes the given |delete_directive| and sends it to the
   // SyncChangeProcessor (if it exists).  Returns any error resulting
   // from sending the delete directive to sync.
@@ -547,6 +548,15 @@ class HistoryService : public syncer::SyncableService,
   friend class SyncBookmarkDataTypeControllerTest;
   friend class TestingProfile;
 
+  friend void history::ExpireLocalAndRemoteHistoryBetween(
+      HistoryService* local_history,
+      history::WebHistoryService* web_history,
+      const std::set<GURL>& restrict_urls,
+      base::Time begin_time,
+      base::Time end_time,
+      const base::Closure& callback,
+      base::CancelableTaskTracker* tracker);
+
   // 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
@@ -816,9 +826,6 @@ class HistoryService : public syncer::SyncableService,
   // outlive |HistoryService|.
   history::HistoryClient* history_client_;
 
-  // The profile, may be null when testing.
-  Profile* profile_;
-
   // Used for propagating link highlighting data across renderers. May be null
   // in tests.
   scoped_ptr<visitedlink::VisitedLinkMaster> visitedlink_master_;