Split keyword related parts of WebDataService as KeywordWebDataService

chrome/browser/search_engines/template_url_service_test_util.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 "chrome/browser/search_engines/template_url_service_test_util.h"
 
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "base/strings/string_split.h"
 #include "base/threading/thread.h"
@@ skipping 79 matching lines @@
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1, GetObserverCount());
   ResetObserverCount();
 }
 
 void TemplateURLServiceTestUtilBase::ChangeModelToLoadState() {
   model()->ChangeToLoadedState();
   // Initialize the web data service so that the database gets updated with
   // any changes made.
 
-  model()->service_ = WebDataService::FromBrowserContext(profile());
+  model()->web_data_service_ =
+      WebDataServiceFactory::GetKeywordWebDataForProfile(
+          profile(), Profile::EXPLICIT_ACCESS);
   base::RunLoop().RunUntilIdle();
 }
 
 void TemplateURLServiceTestUtilBase::ClearModel() {
   TemplateURLServiceFactory::GetInstance()->SetTestingFactory(
       profile(), NULL);
 }
 
 void TemplateURLServiceTestUtilBase::ResetModel(bool verify_load) {
   TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
@@ skipping 112 matching lines @@
 
   UIThreadSearchTermsData::SetGoogleBaseURL(std::string());
 
   // Flush the message loop to make application verifiers happy.
   base::RunLoop().RunUntilIdle();
 }
 
 TestingProfile* TemplateURLServiceTestUtil::profile() const {
   return profile_.get();
 }