Handle TemplateURLService load failure better

chrome/browser/search_engines/template_url_service_sync_unittest.cc

Index: chrome/browser/search_engines/template_url_service_sync_unittest.cc
diff --git a/chrome/browser/search_engines/template_url_service_sync_unittest.cc b/chrome/browser/search_engines/template_url_service_sync_unittest.cc
index 1b0332a879135cdf10f9a317e953002359eb4420..3b257b58cc657f19791278df2c0c0fb44d7ec652 100644
--- a/chrome/browser/search_engines/template_url_service_sync_unittest.cc
+++ b/chrome/browser/search_engines/template_url_service_sync_unittest.cc
@@ -213,6 +213,8 @@ class TemplateURLServiceSyncTest : public testing::Test {
 
  protected:
   // We keep two TemplateURLServices to test syncing between them.
+  // Unfortunately we can't have two separate TemplateURLServiceTestUtils, so we
+  // have to use lower-level classes for the second.
   TemplateURLServiceTestUtil test_util_a_;
   scoped_ptr<TestingProfile> profile_b_;
   scoped_ptr<TemplateURLService> model_b_;
@@ -239,7 +241,11 @@ void TemplateURLServiceSyncTest::SetUp() {
   TemplateURLServiceFactory::GetInstance()->
       RegisterUserPrefsOnBrowserContextForTest(profile_b_.get());
   model_b_.reset(new TemplateURLService(profile_b_.get()));
-  model_b_->Load();
+  // These next three lines duplicate
+  // TemplateURLServiceTestUtil::ChangeModelToLoadState().
+  model_b_->ChangeToLoadedState();
+  model_b_->service_ = WebDataService::FromBrowserContext(profile_b_.get());
+  base::RunLoop().RunUntilIdle();
 }
 
 void TemplateURLServiceSyncTest::TearDown() {