Make WebDataService no longer depend on ProfileKeyedService

chrome/browser/search_engines/template_url_service_unittest.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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/string_util.h"
@@ skipping 1294 matching lines @@
 // Simulates failing to load the webdb and makes sure the default search
 // provider is valid.
 TEST_F(TemplateURLServiceTest, FailedInit) {
   test_util_.VerifyLoad();
 
   test_util_.ClearModel();
   scoped_refptr<WebDataService> web_service =
       WebDataServiceFactory::GetForProfile(test_util_.profile(),
                                            Profile::EXPLICIT_ACCESS);
   web_service->UnloadDatabase();
+  TemplateURLServiceTestUtil::BlockTillServiceProcessesRequests();
   web_service->set_failed_init(true);
 
   test_util_.ResetModel(false);
   model()->Load();
   test_util_.BlockTillServiceProcessesRequests();
 
   ASSERT_TRUE(model()->GetDefaultSearchProvider());
 }
 
 // Verifies that if the default search URL preference is managed, we report
@@ skipping 192 matching lines @@
   EXPECT_EQ(8U, loaded_url->input_encodings().size());
 
   // Reload the model to verify it was actually saved to the database and the
   // duplicate encodings were removed.
   test_util_.ResetModel(true);
   ASSERT_EQ(initial_count + 1, model()->GetTemplateURLs().size());
   loaded_url = model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword"));
   ASSERT_FALSE(loaded_url == NULL);
   EXPECT_EQ(4U, loaded_url->input_encodings().size());
 }