Moved WebDataService to ProfileKeyedService

chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc

Index: chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
index 70ba2ac162ab66219afe143fd77a7ecf2fb6879f..dc6f49a55251dd80b5dad66c0ccf1f00d56f2ee1 100644
--- a/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
+++ b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
@@ -11,6 +11,7 @@
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
 #include "chrome/browser/ui/search_engines/template_url_table_model.h"
+#include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service.h"
@@ -30,6 +31,8 @@ static const string16 kB1(ASCIIToUTF16("b1"));
 class KeywordEditorControllerTest : public testing::Test,
                                     public ui::TableModelObserver {
  public:
+  KeywordEditorControllerTest() {}

[Peter Kasting, 2012/03/30 20:31:13]

Nit: It would be nice while here to move these inline definitions out-of-line,
and mark the virtual functions with OVERRIDE

[GeorgeY, 2012/04/02 21:57:43]

Sure

+
   // Initializes all of the state.
   void Init(bool simulate_load_failure);
 
@@ -115,6 +118,8 @@ void KeywordEditorControllerTest::Init(bool simulate_load_failure) {
   profile_.reset(new TestingProfile());
   profile_->CreateTemplateURLService();
 
+  WebDataServiceFactory::GetInstance()->SetTestingFactory(profile_.get(), NULL);
+
   model_ = TemplateURLServiceFactory::GetForProfile(profile_.get());
   if (simulate_load_failure)
     model_->OnWebDataServiceRequestDone(0, NULL);