chrome/browser/history/in_memory_url_index_unittest.cc - Issue 257003004: Remove dependency on bookmark_model_factory from bookmark_test_helpers

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/history/in_memory_url_index_unittest.cc

Issue 257003004: Remove dependency on bookmark_model_factory from bookmark_test_helpers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@364433

Patch Set: Fix unit tests on Linux & Windows Created 6 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/history/android/sqlite_cursor_unittest.cc ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/history/in_memory_url_index_unittest.cc

diff --git a/chrome/browser/history/in_memory_url_index_unittest.cc b/chrome/browser/history/in_memory_url_index_unittest.cc

index 29fed9b687d2830317b2597e9cd8113e5f9cb09e..b6b34f3cbf3453978e13ac3abe3c5fb7113eb8b3 100644

--- a/chrome/browser/history/in_memory_url_index_unittest.cc

+++ b/chrome/browser/history/in_memory_url_index_unittest.cc

@@ -15,6 +15,7 @@

#include "base/strings/string_util.h"

#include "base/strings/utf_string_conversions.h"

#include "chrome/browser/autocomplete/autocomplete_provider.h"

+#include "chrome/browser/bookmarks/bookmark_model_factory.h"

#include "chrome/browser/bookmarks/bookmark_test_helpers.h"

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/history/history_backend.h"

@@ -189,7 +190,8 @@ void InMemoryURLIndexTest::SetUp() {

// We cannot access the database until the backend has been loaded.

ASSERT_TRUE(profile_.CreateHistoryService(true, false));

profile_.CreateBookmarkModel(true);

- test::WaitForBookmarkModelToLoad(&profile_);

+ test::WaitForBookmarkModelToLoad(

+ BookmarkModelFactory::GetForProfile(&profile_));

profile_.BlockUntilHistoryProcessesPendingRequests();

profile_.BlockUntilHistoryIndexIsRefreshed();

history_service_ = HistoryServiceFactory::GetForProfile(