Use BookmarkModelFactory::GetForBrowserContext everywhere

chrome/browser/autocomplete/in_memory_url_index_factory.cc

 // Copyright 2015 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/autocomplete/in_memory_url_index_factory.h"
 
 #include "base/memory/singleton.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
@@ skipping 27 matching lines @@
 
 InMemoryURLIndexFactory::~InMemoryURLIndexFactory() {
 }
 
 KeyedService* InMemoryURLIndexFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   // Do not force creation of the HistoryService if saving history is disabled.
   Profile* profile = Profile::FromBrowserContext(context);
   SchemeSet chrome_schemes_to_whitelist;
   chrome_schemes_to_whitelist.insert(content::kChromeUIScheme);
-  InMemoryURLIndex* in_memory_url_index = new InMemoryURLIndex(
-      BookmarkModelFactory::GetForProfile(profile),
-      HistoryServiceFactory::GetForProfile(profile,
-                                           ServiceAccessType::IMPLICIT_ACCESS),
-      TemplateURLServiceFactory::GetForProfile(profile),
-      content::BrowserThread::GetBlockingPool(), profile->GetPath(),
-      chrome_schemes_to_whitelist);
+  InMemoryURLIndex* in_memory_url_index =
+      new InMemoryURLIndex(BookmarkModelFactory::GetForBrowserContext(profile),
+                           HistoryServiceFactory::GetForProfile(
+                               profile, ServiceAccessType::IMPLICIT_ACCESS),
+                           TemplateURLServiceFactory::GetForProfile(profile),
+                           content::BrowserThread::GetBlockingPool(),
+                           profile->GetPath(), chrome_schemes_to_whitelist);
   in_memory_url_index->Init();
   return in_memory_url_index;
 }
 
 content::BrowserContext* InMemoryURLIndexFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 bool InMemoryURLIndexFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }