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

Unified Diff: chrome/browser/history/android/sqlite_cursor_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/history/android/sqlite_cursor_unittest.cc
diff --git a/chrome/browser/history/android/sqlite_cursor_unittest.cc b/chrome/browser/history/android/sqlite_cursor_unittest.cc
index 634037f81a065ca9674b9c889e8ebd68705392e3..421db9fb9e8a5f857881cd5c58595901ff34517f 100644
--- a/chrome/browser/history/android/sqlite_cursor_unittest.cc
+++ b/chrome/browser/history/android/sqlite_cursor_unittest.cc
@@ -20,6 +20,7 @@
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/testing_profile_manager.h"
+#include "chrome/test/base/ui_test_utils.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/test/test_browser_thread.h"
#include "content/public/test/test_utils.h"
@@ -59,8 +60,9 @@ class SQLiteCursorTest : public testing::Test,
chrome::kInitialProfile);
testing_profile_->CreateBookmarkModel(true);
+ ui_test_utils::WaitForBookmarkModelToLoad(testing_profile_);
+
testing_profile_->CreateFaviconService();
- testing_profile_->BlockUntilBookmarkModelLoaded();
testing_profile_->CreateHistoryService(true, false);
service_.reset(new AndroidHistoryProviderService(testing_profile_));
hs_ = HistoryServiceFactory::GetForProfile(testing_profile_,

Powered by Google App Engine
This is Rietveld 408576698