Componentize WebHistoryService

chrome/browser/history/web_history_service_factory.cc

Index: chrome/browser/history/web_history_service_factory.cc
diff --git a/chrome/browser/history/web_history_service_factory.cc b/chrome/browser/history/web_history_service_factory.cc
index 54fd8814ff72c2c3c7260b9e4e81c16f5e6f5915..af6a715f38ad5c93ba27db9d37e7af98b07377a9 100644
--- a/chrome/browser/history/web_history_service_factory.cc
+++ b/chrome/browser/history/web_history_service_factory.cc
@@ -4,12 +4,15 @@
 
 #include "chrome/browser/history/web_history_service_factory.h"
 
-#include "chrome/browser/content_settings/cookie_settings.h"
-#include "chrome/browser/history/web_history_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
+#include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
+#include "components/history/core/browser/web_history_service.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
+#include "components/signin/core/browser/profile_oauth2_token_service.h"
+#include "components/signin/core/browser/signin_manager.h"
+#include "net/url_request/url_request_context_getter.h"
 
 namespace {
 // Returns true if the user is signed in and full history sync is enabled,
@@ -32,29 +35,33 @@ WebHistoryServiceFactory* WebHistoryServiceFactory::GetInstance() {
 // static
 history::WebHistoryService* WebHistoryServiceFactory::GetForProfile(
       Profile* profile) {
-  if (IsHistorySyncEnabled(profile)) {
-    return static_cast<history::WebHistoryService*>(
-        GetInstance()->GetServiceForBrowserContext(profile, true));
-  }
-  return NULL;
+  if (!IsHistorySyncEnabled(profile))
+    return nullptr;
+
+  return static_cast<history::WebHistoryService*>(
+      GetInstance()->GetServiceForBrowserContext(profile, true));
 }
 
 KeyedService* WebHistoryServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   Profile* profile = static_cast<Profile*>(context);
-
   // Ensure that the service is not instantiated or used if the user is not
   // signed into sync, or if web history is not enabled.
-  return IsHistorySyncEnabled(profile) ?
-      new history::WebHistoryService(profile) : NULL;
+  if (!IsHistorySyncEnabled(profile))
+    return nullptr;
+
+  return new history::WebHistoryService(
+      ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
+      SigninManagerFactory::GetForProfile(profile),
+      profile->GetRequestContext());
 }
 
 WebHistoryServiceFactory::WebHistoryServiceFactory()
     : BrowserContextKeyedServiceFactory(
         "WebHistoryServiceFactory",
         BrowserContextDependencyManager::GetInstance()) {
-  DependsOn(CookieSettings::Factory::GetInstance());
   DependsOn(ProfileOAuth2TokenServiceFactory::GetInstance());
+  DependsOn(SigninManagerFactory::GetInstance());
 }
 
 WebHistoryServiceFactory::~WebHistoryServiceFactory() {