Abstract //content-level dependencies out of InMemoryURLIndex

chrome/browser/autocomplete/in_memory_url_index.h

Index: chrome/browser/autocomplete/in_memory_url_index.h
diff --git a/chrome/browser/autocomplete/in_memory_url_index.h b/chrome/browser/autocomplete/in_memory_url_index.h
index 2b3199cf1f332db2cb2b5fd60b2818959c0ddf6a..6101977bdde577f722a4ddc46fb63b42d5c86fba 100644
--- a/chrome/browser/autocomplete/in_memory_url_index.h
+++ b/chrome/browser/autocomplete/in_memory_url_index.h
@@ -18,6 +18,8 @@
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/task/cancelable_task_tracker.h"
+#include "base/threading/sequenced_worker_pool.h"
+#include "base/threading/thread_checker.h"
 #include "chrome/browser/autocomplete/scored_history_match.h"
 #include "components/history/core/browser/history_db_task.h"
 #include "components/history/core/browser/history_service_observer.h"
@@ -101,8 +103,10 @@ class InMemoryURLIndex : public KeyedService,
   // characters.
   InMemoryURLIndex(bookmarks::BookmarkModel* bookmark_model,
                    history::HistoryService* history_service,
+                   base::SequencedWorkerPool* worker_pool,
                    const base::FilePath& history_dir,
-                   const std::string& languages);
+                   const std::string& languages,
+                   const std::set<std::string>& client_schemes_to_whitelist);

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

I wonder if it makes sense to add a typedef for this set of strings.

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

Done.

   ~InMemoryURLIndex() override;
 
   // Opens and prepares the index of historical URL visits. If the index private
@@ -311,6 +315,8 @@ class InMemoryURLIndex : public KeyedService,
   // HistoryServiceLoaded Notification.
   bool listen_to_history_service_loaded_;
 
+  base::ThreadChecker thread_checker_;
+
   DISALLOW_COPY_AND_ASSIGN(InMemoryURLIndex);
 };