From 1f9c7419c011d99b14e22ae7d213ff88c901f4c6 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Mon, 25 Mar 2013 23:04:35 +0000 Subject: bookmarks: Get rid of TestingProfile::BlockUntilBookmarkModelLoaded(). BlockUntilBookmarkModelLoaded() is just a tiny wrapper around WaitForBookmarkModelToLoad(), so it doesn't add much per se, and we ended up calling BookmarkModelFactory::GetForProfile() twice, either before or after the call to BlockUntilBookmarkModelLoaded(). BUG=144783 R=sky@chromium.org Review URL: https://codereview.chromium.org/12929016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190511 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/test/base/ui_test_utils.cc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'chrome/test/base/ui_test_utils.cc') diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc index ccd9bdd..f3b91f6 100644 --- a/chrome/test/base/ui_test_utils.cc +++ b/chrome/test/base/ui_test_utils.cc @@ -25,6 +25,7 @@ #include "base/values.h" #include "chrome/browser/autocomplete/autocomplete_controller.h" #include "chrome/browser/bookmarks/bookmark_model.h" +#include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/history/history_service_factory.h" @@ -426,6 +427,10 @@ void WaitForBookmarkModelToLoad(BookmarkModel* model) { ASSERT_TRUE(model->IsLoaded()); } +void WaitForBookmarkModelToLoad(Profile* profile) { + WaitForBookmarkModelToLoad(BookmarkModelFactory::GetForProfile(profile)); +} + void WaitForTemplateURLServiceToLoad(TemplateURLService* service) { if (service->loaded()) return; -- cgit v1.1