Use BookmarkModelFactory::GetForBrowserContext everywhere

chrome/test/base/testing_profile.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/test/base/testing_profile.h"
 
 #include <utility>
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 176 matching lines @@
 
  protected:
   ~TestExtensionURLRequestContextGetter() override {}
 
  private:
   std::unique_ptr<net::URLRequestContext> context_;
 };
 
 std::unique_ptr<KeyedService> BuildHistoryService(
     content::BrowserContext* context) {
-  Profile* profile = Profile::FromBrowserContext(context);
   return base::WrapUnique(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))));
 }
 
 std::unique_ptr<KeyedService> BuildInMemoryURLIndex(
     content::BrowserContext* context) {
   Profile* profile = Profile::FromBrowserContext(context);
   std::unique_ptr<InMemoryURLIndex> in_memory_url_index(
-      new InMemoryURLIndex(BookmarkModelFactory::GetForProfile(profile),
+      new InMemoryURLIndex(BookmarkModelFactory::GetForBrowserContext(profile),
                            HistoryServiceFactory::GetForProfile(
                                profile, ServiceAccessType::IMPLICIT_ACCESS),
                            TemplateURLServiceFactory::GetForProfile(profile),
                            content::BrowserThread::GetBlockingPool(),
                            profile->GetPath(), SchemeSet()));
   in_memory_url_index->Init();
   return std::move(in_memory_url_index);
 }
 
 std::unique_ptr<KeyedService> BuildBookmarkModel(
@@ skipping 850 matching lines @@
   // Note: Owned by |original_profile|.
   return new TestingProfile(path_, delegate_,
 #if defined(ENABLE_EXTENSIONS)
                             extension_policy_,
 #endif
                             std::move(pref_service_), original_profile,
                             guest_session_, supervised_user_id_,
                             std::move(policy_service_), testing_factories_,
                             profile_name_);
 }