Moved WebDataService to ProfileKeyedService

chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc

 // Copyright (c) 2011 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/message_loop.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #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"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/models/table_model_observer.h"
 
 static const string16 kA(ASCIIToUTF16("a"));
 static const string16 kA1(ASCIIToUTF16("a1"));
 static const string16 kB(ASCIIToUTF16("b"));
 static const string16 kB1(ASCIIToUTF16("b1"));
 
 // Base class for keyword editor tests. Creates a profile containing an
 // empty TemplateURLService.
 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);
 
   virtual void SetUp() {
     Init(false);
   }
 
   virtual void OnModelChanged() {
     model_changed_count_++;
   }
@@ skipping 65 matching lines @@
 
 void KeywordEditorControllerTest::Init(bool simulate_load_failure) {
   ClearChangeCount();
 
   // If init is called twice, make sure that the controller is destroyed before
   // the profile is.
   controller_.reset();
   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);
 
   controller_.reset(new KeywordEditorController(profile_.get()));
   controller_->table_model()->SetObserver(this);
 }
 
 // Tests adding a TemplateURL.
 TEST_F(KeywordEditorControllerTest, Add) {
@@ skipping 124 matching lines @@
   turl->set_short_name(ASCIIToUTF16("b"));
   model_->Add(turl);
 
   // Table model should have updated.
   VerifyChangeCount(1, 0, 0, 0);
 
   // And should contain the newly added TemplateURL.
   ASSERT_EQ(1, table_model()->RowCount());
   ASSERT_EQ(0, table_model()->IndexOfTemplateURL(turl));
 }