Second try at splitting WebDataService (minus ownership changes)

chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc

Index: chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc
diff --git a/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc b/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc
index b7cbb3e88e4ee9eb65fd5c9cdc725fa95f80dbf5..978c329847831fbcb7ada0fe39ef23b80a97fb26 100644
--- a/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc
@@ -128,7 +128,6 @@ TEST_F(SyncSearchEngineDataTypeControllerTest, StartURLServiceNotReady) {
       WillOnce(MakeSharedChangeProcessor());
 
   EXPECT_CALL(model_load_callback_, Run(_, _));
-
   EXPECT_FALSE(syncable_service_.syncing());
   search_engine_dtc_->LoadModels(
       base::Bind(&ModelLoadCallbackMock::Run,
@@ -142,6 +141,9 @@ TEST_F(SyncSearchEngineDataTypeControllerTest, StartURLServiceNotReady) {
       content::Source<TemplateURLService>(test_util_.model()),
       content::NotificationService::NoDetails());
   EXPECT_EQ(DataTypeController::MODEL_LOADED, search_engine_dtc_->state());
+
+  // Wait until WebDB is loaded before we shut it down.
+  test_util_.BlockTillServiceProcessesRequests();
 }
 
 TEST_F(SyncSearchEngineDataTypeControllerTest, StartFirstRun) {