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 e38b78cc8ac45f4089a2d43a12d5dbbf17d0ea81..23c8e4b3eca30c08cfa70aed02b7d9c2b7434a52 100644
--- a/chrome/browser/history/history_service.h
+++ b/chrome/browser/history/history_service.h
@@ -39,9 +39,10 @@ class AndroidHistoryProviderService;
 #endif
 
 class GURL;
+class HistoryService;
+struct ImportedFaviconUsage;
 class PageUsageRequest;
 class Profile;
-struct ImportedFaviconUsage;
 class SkBitmap;
 
 namespace base {
@@ -72,6 +73,7 @@ struct KeywordSearchTermVisit;
 class PageUsageData;
 class URLDatabase;
 class VisitFilter;
+class WebHistoryService;
 
 }  // namespace history
 
@@ -354,11 +356,13 @@ class HistoryService : public syncer::SyncableService,
   // 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);
+  void ExpireLocalAndRemoteHistoryBetween(
+      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);
 
   // Processes the given |delete_directive| and sends it to the
   // SyncChangeProcessor (if it exists).  Returns any error resulting
@@ -816,9 +820,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_;