Moves shared history test helpers into util classes.

components/omnibox/browser/in_memory_url_index_test_util.cc

Index: components/omnibox/browser/in_memory_url_index_test_util.cc
diff --git a/components/omnibox/browser/in_memory_url_index_test_util.cc b/components/omnibox/browser/in_memory_url_index_test_util.cc
new file mode 100644
index 0000000000000000000000000000000000000000..474af2d78e22730e114bd74d2a0bae6629d8a899
--- /dev/null
+++ b/components/omnibox/browser/in_memory_url_index_test_util.cc
@@ -0,0 +1,29 @@
+// Copyright 2016 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 "components/omnibox/browser/in_memory_url_index_test_util.h"
+
+#include "base/run_loop.h"
+#include "components/history/core/browser/history_backend.h"
+#include "components/history/core/browser/history_database.h"
+#include "components/history/core/browser/history_service.h"
+#include "components/omnibox/browser/history_index_restore_observer.h"
+#include "components/omnibox/browser/in_memory_url_index.h"
+
+void RebuildInMemoryURLIndex(InMemoryURLIndex* index,
+                             history::HistoryService* history) {
+  index->RebuildFromHistory(history->history_backend_->db());
+  BlockUntilInMemoryURLIndexIsRefreshed(index);
+}
+
+void BlockUntilInMemoryURLIndexIsRefreshed(InMemoryURLIndex* index) {
+  if (!index || index->restored())
+    return;
+  base::RunLoop run_loop;
+  HistoryIndexRestoreObserver observer(run_loop.QuitClosure());
+  index->set_restore_cache_observer(&observer);
+  run_loop.Run();
+  index->set_restore_cache_observer(nullptr);
+  DCHECK(index->restored());
+}