Split keyword related parts of WebDataService as KeywordWebDataService

chrome/browser/webdata/web_data_service_factory.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/webdata/web_data_service_factory.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/sync/glue/sync_start_util.h"
 #include "chrome/browser/ui/profile_error_dialog.h"
 #include "chrome/browser/webdata/autocomplete_syncable_service.h"
 #include "chrome/browser/webdata/keyword_table.h"
+#include "chrome/browser/webdata/keyword_web_data_service.h"
 #include "chrome/browser/webdata/logins_table.h"
 #include "chrome/browser/webdata/web_apps_table.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/browser/webdata/web_intents_table.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/webdata/autofill_profile_syncable_service.h"
 #include "components/autofill/core/browser/webdata/autofill_table.h"
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/signin/core/browser/webdata/token_service_table.h"
@@ skipping 73 matching lines @@
   web_database_->AddTable(
       scoped_ptr<WebDatabaseTable>(new WebIntentsTable()));
 
   web_database_->LoadDatabase();
 
   autofill_web_data_ = new AutofillWebDataService(
       web_database_, ui_thread, db_thread, base::Bind(
           &ProfileErrorCallback, PROFILE_ERROR_DB_AUTOFILL_WEB_DATA));
   autofill_web_data_->Init();
 
+  keyword_web_data_ = new KeywordWebDataService(
+      web_database_, ui_thread, base::Bind(
+          &ProfileErrorCallback, PROFILE_ERROR_DB_KEYWORD_WEB_DATA));
+  keyword_web_data_->Init();
+
   token_web_data_ = new TokenWebData(
       web_database_, ui_thread, db_thread, base::Bind(
          &ProfileErrorCallback, PROFILE_ERROR_DB_TOKEN_WEB_DATA));
   token_web_data_->Init();
 
   web_data_ = new WebDataService(
       web_database_, base::Bind(&ProfileErrorCallback,
                                 PROFILE_ERROR_DB_WEB_DATA));
   web_data_->Init();
 
   autofill_web_data_->GetAutofillBackend(
          base::Bind(&InitSyncableServicesOnDBThread,
                     autofill_web_data_,
                     profile_path,
                     g_browser_process->GetApplicationLocale()));
 }
 
 WebDataServiceWrapper::~WebDataServiceWrapper() {
 }
 
 void WebDataServiceWrapper::Shutdown() {
   autofill_web_data_->ShutdownOnUIThread();
+  keyword_web_data_->ShutdownOnUIThread();
   token_web_data_->ShutdownOnUIThread();
   web_data_->ShutdownOnUIThread();
   web_database_->ShutdownDatabase();
 }
 
 scoped_refptr<AutofillWebDataService>
 WebDataServiceWrapper::GetAutofillWebData() {
   return autofill_web_data_.get();
 }
 
+scoped_refptr<KeywordWebDataService>
+WebDataServiceWrapper::GetKeywordWebData() {
+  return keyword_web_data_.get();
+}
+
 scoped_refptr<WebDataService> WebDataServiceWrapper::GetWebData() {
   return web_data_.get();
 }
 
 scoped_refptr<TokenWebData> WebDataServiceWrapper::GetTokenWebData() {
   return token_web_data_.get();
 }
 
 // static
 scoped_refptr<WebDataService> WebDataService::FromBrowserContext(
@@ skipping 50 matching lines @@
     Profile::ServiceAccessType access_type) {
   WebDataServiceWrapper* wrapper =
       WebDataServiceFactory::GetForProfile(profile, access_type);
   // |wrapper| can be NULL in Incognito mode.
   return wrapper ?
       wrapper->GetAutofillWebData() :
       scoped_refptr<AutofillWebDataService>(NULL);
 }
 
 // static
+scoped_refptr<KeywordWebDataService>
+WebDataServiceFactory::GetKeywordWebDataForProfile(
+    Profile* profile,
+    Profile::ServiceAccessType access_type) {
+  WebDataServiceWrapper* wrapper =
+      WebDataServiceFactory::GetForProfile(profile, access_type);
+  // |wrapper| can be NULL in Incognito mode.
+  return wrapper ?
+      wrapper->GetKeywordWebData() : scoped_refptr<KeywordWebDataService>(NULL);
+}
+
+// static
 scoped_refptr<TokenWebData>
 WebDataServiceFactory::GetTokenWebDataForProfile(
     Profile* profile,
     Profile::ServiceAccessType access_type) {
   WebDataServiceWrapper* wrapper =
       WebDataServiceFactory::GetForProfile(profile, access_type);
   // |wrapper| can be NULL in Incognito mode.
   return wrapper ? wrapper->GetTokenWebData()
                  : scoped_refptr<TokenWebData>(NULL);
 }
 
 // static
 WebDataServiceFactory* WebDataServiceFactory::GetInstance() {
   return Singleton<WebDataServiceFactory>::get();
 }
 
 content::BrowserContext* WebDataServiceFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 KeyedService* WebDataServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* profile) const {
   return new WebDataServiceWrapper(static_cast<Profile*>(profile));
 }
 
 bool WebDataServiceFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }