Use BookmarkModelFactory::GetForBrowserContext everywhere

chrome/browser/history/history_service_factory.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/history/history_service_factory.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/history/chrome_history_client.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
@@ skipping 59 matching lines @@
           "HistoryService",
           BrowserContextDependencyManager::GetInstance()) {
   DependsOn(BookmarkModelFactory::GetInstance());
 }
 
 HistoryServiceFactory::~HistoryServiceFactory() {
 }
 
 KeyedService* HistoryServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
-  Profile* profile = Profile::FromBrowserContext(context);
   std::unique_ptr<history::HistoryService> history_service(
       new history::HistoryService(
           base::WrapUnique(new ChromeHistoryClient(
-              BookmarkModelFactory::GetForProfile(profile))),
-          base::WrapUnique(new history::ContentVisitDelegate(profile))));
+              BookmarkModelFactory::GetForBrowserContext(context))),
+          base::WrapUnique(new history::ContentVisitDelegate(context))));
   if (!history_service->Init(
-          history::HistoryDatabaseParamsForPath(profile->GetPath()))) {
+          history::HistoryDatabaseParamsForPath(context->GetPath()))) {
     return nullptr;
   }
   return history_service.release();
 }
 
 content::BrowserContext* HistoryServiceFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 bool HistoryServiceFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }