Remove dependency of HistoryService on WebHistoryServiceFactory

chrome/browser/history/history_service.cc

Index: chrome/browser/history/history_service.cc
diff --git a/chrome/browser/history/history_service.cc b/chrome/browser/history/history_service.cc
index c07d4f328415d7aa4f6082d5fdba59603f16176d..9d28ae32c0dfb43e39bd6cbd6885595e7970bd39 100644
--- a/chrome/browser/history/history_service.cc
+++ b/chrome/browser/history/history_service.cc
@@ -31,8 +31,6 @@
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/in_memory_history_backend.h"
 #include "chrome/browser/history/in_memory_url_index.h"
-#include "chrome/browser/history/web_history_service.h"
-#include "chrome/browser/history/web_history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/importer/imported_favicon_usage.h"
 #include "chrome/common/url_constants.h"
@@ -104,14 +102,6 @@ class URLIteratorFromURLRows
   DISALLOW_COPY_AND_ASSIGN(URLIteratorFromURLRows);
 };
 
-// Callback from WebHistoryService::ExpireWebHistory().
-void ExpireWebHistoryComplete(bool success) {
-  // Ignore the result.
-  //
-  // TODO(davidben): ExpireLocalAndRemoteHistoryBetween callback should not fire
-  // until this completes.
-}
-
 }  // namespace
 
 // Sends messages from the backend to us on the main thread. This must be a
@@ -217,7 +207,6 @@ class HistoryService::BackendDelegate : public HistoryBackend::Delegate {
 HistoryService::HistoryService()
     : thread_(new base::Thread(kHistoryThreadName)),
       history_client_(NULL),
-      profile_(NULL),
       backend_loaded_(false),
       no_db_(false),
       weak_ptr_factory_(this) {
@@ -227,7 +216,6 @@ HistoryService::HistoryService(
     history::HistoryClient* history_client, Profile* profile)
     : thread_(new base::Thread(kHistoryThreadName)),
       history_client_(history_client),
-      profile_(profile),
       visitedlink_master_(new visitedlink::VisitedLinkMaster(
           profile, this, true)),
       backend_loaded_(false),
@@ -1153,36 +1141,6 @@ void HistoryService::ExpireHistory(
       callback);
 }
 
-void HistoryService::ExpireLocalAndRemoteHistoryBetween(
-    const std::set<GURL>& restrict_urls,
-    Time begin_time,
-    Time end_time,
-    const base::Closure& callback,
-    base::CancelableTaskTracker* tracker) {
-  // TODO(dubroy): This should be factored out into a separate class that
-  // dispatches deletions to the proper places.
-
-  history::WebHistoryService* web_history =
-      WebHistoryServiceFactory::GetForProfile(profile_);
-  if (web_history) {
-    // TODO(dubroy): This API does not yet support deletion of specific URLs.
-    DCHECK(restrict_urls.empty());
-
-    delete_directive_handler_.CreateDeleteDirectives(
-        std::set<int64>(), begin_time, end_time);
-
-    // Attempt online deletion from the history server, but ignore the result.
-    // Deletion directives ensure that the results will eventually be deleted.
-    //
-    // TODO(davidben): |callback| should not run until this operation completes
-    // too.
-    web_history->ExpireHistoryBetween(
-        restrict_urls, begin_time, end_time,
-        base::Bind(&ExpireWebHistoryComplete));
-  }
-  ExpireHistoryBetween(restrict_urls, begin_time, end_time, callback, tracker);
-}
-
 void HistoryService::OnDBLoaded() {
   DCHECK(thread_checker_.CalledOnValidThread());
   backend_loaded_ = true;