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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/test/base/ui_test_utils.cc

Issue 17127002: Correctly integrate StoragePartition into TestingProfile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merged to ToT Created 7 years, 5 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
« chrome/browser/sync_file_system/local_file_sync_service_unittest.cc ('K') | « chrome/test/base/testing_profile.cc ('k') | chrome/test/base/view_event_test_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: 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 f3629e2fe6c04bdfc5d49aa866fd9d9981898642..06ad8c5180344095a61b6f790520ecf43e049683 100644
--- a/chrome/test/base/ui_test_utils.cc
+++ b/chrome/test/base/ui_test_utils.cc
@@ -371,8 +371,13 @@ void WaitForBookmarkModelToLoad(Profile* profile) {
void WaitForTemplateURLServiceToLoad(TemplateURLService* service) {
if (service->loaded())
return;
+
+ content::WindowedNotificationObserver observer(
+ chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
+ content::Source<TemplateURLService>(service));
service->Load();
- TemplateURLServiceTestUtil::BlockTillServiceProcessesRequests();
+ observer.Wait();
+
ASSERT_TRUE(service->loaded());
}
« chrome/browser/sync_file_system/local_file_sync_service_unittest.cc ('K') | « chrome/test/base/testing_profile.cc ('k') | chrome/test/base/view_event_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698