diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-25 23:04:35 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-25 23:04:35 +0000 |
| commit | 1f9c7419c011d99b14e22ae7d213ff88c901f4c6 (patch) | |
| tree | 359c0ac1e34118b2ecabaa8317d549c9ce99db27 /chrome/test/base/ui_test_utils.cc | |
| parent | 580063e026e53a23b1c4af1ca7baf7ad92a918f5 (diff) | |
| download | chromium_src-1f9c7419c011d99b14e22ae7d213ff88c901f4c6.zip chromium_src-1f9c7419c011d99b14e22ae7d213ff88c901f4c6.tar.gz chromium_src-1f9c7419c011d99b14e22ae7d213ff88c901f4c6.tar.bz2 | |
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
Diffstat (limited to 'chrome/test/base/ui_test_utils.cc')
| -rw-r--r-- | chrome/test/base/ui_test_utils.cc | 5 |
1 files changed, 5 insertions, 0 deletions
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; |