Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3641)

Unified Diff: chrome/browser/bookmarks/bookmark_index_unittest.cc

Issue 12929016: bookmarks: Get rid of TestingProfile::BlockUntilBookmarkModelLoaded(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win Created 7 years, 9 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
Index: chrome/browser/bookmarks/bookmark_index_unittest.cc
diff --git a/chrome/browser/bookmarks/bookmark_index_unittest.cc b/chrome/browser/bookmarks/bookmark_index_unittest.cc
index fecf6e250b12352306d80b591ba524d9d29f9870..f970aa9a56e15ecde581f011e8f549da42305418 100644
--- a/chrome/browser/bookmarks/bookmark_index_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_index_unittest.cc
@@ -19,6 +19,7 @@
#include "chrome/browser/history/history_service_factory.h"
#include "chrome/browser/history/url_database.h"
#include "chrome/test/base/testing_profile.h"
+#include "chrome/test/base/ui_test_utils.h"
#include "content/public/test/test_browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -241,9 +242,9 @@ TEST_F(BookmarkIndexTest, GetResultsSortedByTypedCount) {
profile.CreateHistoryService(true, false);
profile.BlockUntilHistoryProcessesPendingRequests();
profile.CreateBookmarkModel(true);
- profile.BlockUntilBookmarkModelLoaded();
BookmarkModel* model = BookmarkModelFactory::GetForProfile(&profile);
+ ui_test_utils::WaitForBookmarkModelToLoad(model);
HistoryService* const history_service =
HistoryServiceFactory::GetForProfile(&profile, Profile::EXPLICIT_ACCESS);
« no previous file with comments | « chrome/browser/bookmarks/bookmark_html_writer_unittest.cc ('k') | chrome/browser/bookmarks/bookmark_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698