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

Unified Diff: chrome/browser/sync/profile_sync_service_bookmark_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/sync/profile_sync_service_bookmark_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
index 25d1ebb570bfa15b4eca5cc5cf7ef3f59c37a27b..e5adeedc9a54ce19960b97da5cee446c88365517 100644
--- a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
@@ -31,6 +31,7 @@
#include "chrome/browser/sync/glue/data_type_error_handler_mock.h"
#include "chrome/common/chrome_switches.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 "sync/api/sync_error.h"
#include "sync/internal_api/public/change_record.h"
@@ -292,8 +293,7 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {
bool delete_bookmarks = load == DELETE_EXISTING_STORAGE;
profile_.CreateBookmarkModel(delete_bookmarks);
model_ = BookmarkModelFactory::GetForProfile(&profile_);
- // Wait for the bookmarks model to load.
- profile_.BlockUntilBookmarkModelLoaded();
+ ui_test_utils::WaitForBookmarkModelToLoad(model_);
// This noticeably speeds up the unit tests that request it.
if (save == DONT_SAVE_TO_STORAGE)
model_->ClearStore();

Powered by Google App Engine
This is Rietveld 408576698