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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/autocomplete/history_quick_provider_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
« no previous file with comments | « chrome/browser/autocomplete/history_contents_provider_unittest.cc ('k') | chrome/browser/bookmarks/bookmark_expanded_state_tracker_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/autocomplete/history_quick_provider_unittest.cc
diff --git a/chrome/browser/autocomplete/history_quick_provider_unittest.cc b/chrome/browser/autocomplete/history_quick_provider_unittest.cc
index c005d604702d1a92b589e6adf8cd0331aadaa6ea..a00ae86891d359cb20fe16371defb2c720b06287 100644
--- a/chrome/browser/autocomplete/history_quick_provider_unittest.cc
+++ b/chrome/browser/autocomplete/history_quick_provider_unittest.cc
@@ -28,6 +28,7 @@
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_browser_process.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"
@@ -149,7 +150,7 @@ void HistoryQuickProviderTest::SetUp() {
profile_.reset(new TestingProfile());
profile_->CreateHistoryService(true, false);
profile_->CreateBookmarkModel(true);
- profile_->BlockUntilBookmarkModelLoaded();
+ ui_test_utils::WaitForBookmarkModelToLoad(profile_.get());
profile_->BlockUntilHistoryIndexIsRefreshed();
history_service_ =
HistoryServiceFactory::GetForProfile(profile_.get(),
« no previous file with comments | « chrome/browser/autocomplete/history_contents_provider_unittest.cc ('k') | chrome/browser/bookmarks/bookmark_expanded_state_tracker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698