Correctly integrate StoragePartition into TestingProfile.

chrome/test/base/ui_test_utils.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/base/ui_test_utils.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 352 matching lines @@
   ASSERT_TRUE(model->loaded());
 }
 
 void WaitForBookmarkModelToLoad(Profile* profile) {
   WaitForBookmarkModelToLoad(BookmarkModelFactory::GetForProfile(profile));
 }
 
 void WaitForTemplateURLServiceToLoad(TemplateURLService* service) {
   if (service->loaded())
     return;
+
+  using content::NotificationDetails;
+  using content::NotificationObserver;
+  using content::NotificationRegistrar;
+  using content::NotificationSource;
+  content::NotificationRegistrar registrar;
+  class LoadedObserver : public NotificationObserver {
+   public:
+    LoadedObserver(base::RunLoop* run_loop) : run_loop_(run_loop) {}
+    virtual void Observe(int type,
+                         const NotificationSource& source,
+                         const NotificationDetails& details) OVERRIDE {
+      CHECK_EQ(chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED, type);
+      run_loop_->Quit();
+    }
+
+   private:
+    base::RunLoop* run_loop_;
+  };
+
+
+  base::RunLoop run_loop;
+  LoadedObserver loaded_observer(&run_loop);
+  registrar.Add(&loaded_observer,
+                chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
+                content::Source<TemplateURLService>(service));
   service->Load();
-  TemplateURLServiceTestUtil::BlockTillServiceProcessesRequests();
+  run_loop.Run();
+
   ASSERT_TRUE(service->loaded());
 }
 
 void WaitForHistoryToLoad(HistoryService* history_service) {
   content::WindowedNotificationObserver history_loaded_observer(
       chrome::NOTIFICATION_HISTORY_LOADED,
       content::NotificationService::AllSources());
   if (!history_service->BackendLoaded())
     history_loaded_observer.Wait();
 }
@@ skipping 165 matching lines @@
 void HistoryEnumerator::HistoryQueryComplete(
     const base::Closure& quit_task,
     HistoryService::Handle request_handle,
     history::QueryResults* results) {
   for (size_t i = 0; i < results->size(); ++i)
     urls_.push_back((*results)[i].url());
   quit_task.Run();
 }
 
 }  // namespace ui_test_utils