Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2271)

Unified Diff: chrome/browser/history/history_service_factory.cc

Issue 849323002: Componentize HistoryDatabase (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix android compilation Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/history/history_service.cc ('k') | chrome/browser/history/history_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/history/history_service_factory.cc
diff --git a/chrome/browser/history/history_service_factory.cc b/chrome/browser/history/history_service_factory.cc
index 8955bdc6024ef0023a2036039cae74c82adde5e8..87a406afa3e0275cc2b2a7a707aff295bd2e59c2 100644
--- a/chrome/browser/history/history_service_factory.cc
+++ b/chrome/browser/history/history_service_factory.cc
@@ -15,6 +15,8 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/pref_names.h"
#include "components/bookmarks/browser/bookmark_model.h"
+#include "components/history/content/browser/history_database_helper.h"
+#include "components/history/core/browser/history_database_params.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "components/keyed_service/core/service_access_type.h"
@@ -76,8 +78,10 @@ KeyedService* HistoryServiceFactory::BuildServiceInstanceFor(
Profile* profile = static_cast<Profile*>(context);
scoped_ptr<HistoryService> history_service(new HistoryService(
ChromeHistoryClientFactory::GetForProfile(profile), profile));
- if (!history_service->Init(profile->GetPath()))
- return NULL;
+ if (!history_service->Init(
+ history::HistoryDatabaseParamsForPath(profile->GetPath()))) {
+ return nullptr;
+ }
ChromeBookmarkClientFactory::GetForProfile(profile)
->SetHistoryService(history_service.get());
return history_service.release();
« no previous file with comments | « chrome/browser/history/history_service.cc ('k') | chrome/browser/history/history_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698