Abstract //content-level dependencies out of InMemoryURLIndex

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 "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
@@ skipping 181 matching lines @@
   Profile* profile = Profile::FromBrowserContext(context);
   return make_scoped_ptr(new history::HistoryService(
       ChromeHistoryClientFactory::GetForProfile(profile),
       scoped_ptr<history::VisitDelegate>(
           new history::ContentVisitDelegate(profile))));
 }
 
 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();
 }
 
 scoped_ptr<KeyedService> BuildBookmarkModel(content::BrowserContext* context) {
   Profile* profile = static_cast<Profile*>(context);
   ChromeBookmarkClient* bookmark_client =
       ChromeBookmarkClientFactory::GetForProfile(profile);
   scoped_ptr<BookmarkModel> bookmark_model(new BookmarkModel(bookmark_client));
   bookmark_client->Init(bookmark_model.get());
@@ skipping 855 matching lines @@
 #if defined(ENABLE_EXTENSIONS)
                             extension_policy_,
 #endif
                             pref_service_.Pass(),
                             original_profile,
                             guest_session_,
                             supervised_user_id_,
                             policy_service_.Pass(),
                             testing_factories_);
 }