Abstract //content-level dependencies out of InMemoryURLIndex

chrome/test/base/testing_profile.cc

Index: chrome/test/base/testing_profile.cc
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index 134ff9652b9e8c4462e9ce769b31fc59c2b01446..844f74f90991ccdb6363821690de4552f015e7de 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -199,12 +199,15 @@ scoped_ptr<KeyedService> BuildHistoryService(content::BrowserContext* context) {
 scoped_ptr<KeyedService> BuildInMemoryURLIndex(
     content::BrowserContext* context) {
   Profile* profile = Profile::FromBrowserContext(context);
+  std::set<std::string> chrome_schemes_to_whitelist;
+  chrome_schemes_to_whitelist.insert(content::kChromeUIScheme);

[Peter Kasting, 2015/06/16 22:18:07]

Is this actually important for some tests?

[blundell, 2015/06/17 07:55:44]

Nope. Removed.

   scoped_ptr<InMemoryURLIndex> in_memory_url_index(new InMemoryURLIndex(
       BookmarkModelFactory::GetForProfile(profile),
       HistoryServiceFactory::GetForProfile(profile,
                                            ServiceAccessType::IMPLICIT_ACCESS),
-      profile->GetPath(),
-      profile->GetPrefs()->GetString(prefs::kAcceptLanguages)));
+      content::BrowserThread::GetBlockingPool(), profile->GetPath(),
+      profile->GetPrefs()->GetString(prefs::kAcceptLanguages),
+      chrome_schemes_to_whitelist));
   in_memory_url_index->Init();
   return in_memory_url_index.Pass();
 }