Split keyword related parts of WebDataService as KeywordWebDataService

chrome/browser/webdata/web_data_service.cc

Index: chrome/browser/webdata/web_data_service.cc
diff --git a/chrome/browser/webdata/web_data_service.cc b/chrome/browser/webdata/web_data_service.cc
index 4ed9c9b03ead22498669a29cb58cf5f2970af21c..b981782a6c1544f2da140dcec98f7f0b6b4948b3 100644
--- a/chrome/browser/webdata/web_data_service.cc
+++ b/chrome/browser/webdata/web_data_service.cc
@@ -5,9 +5,6 @@
 #include "chrome/browser/webdata/web_data_service.h"
 
 #include "base/bind.h"
-#include "base/stl_util.h"
-#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/webdata/keyword_table.h"
 #include "chrome/browser/webdata/logins_table.h"
 #include "chrome/browser/webdata/web_apps_table.h"
 #include "chrome/browser/webdata/web_intents_table.h"
@@ -15,9 +12,6 @@
 #include "components/signin/core/browser/webdata/token_service_table.h"
 #include "components/webdata/common/web_database_service.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/browser/notification_source.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -27,97 +21,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 using base::Bind;
-using base::Time;
 using content::BrowserThread;
 
 WDAppImagesResult::WDAppImagesResult() : has_all_images(false) {}
 
 WDAppImagesResult::~WDAppImagesResult() {}
 
-WDKeywordsResult::WDKeywordsResult()
-  : default_search_provider_id(0),
-    builtin_keyword_version(0) {
-}
-
-WDKeywordsResult::~WDKeywordsResult() {}
-
-WebDataService::KeywordBatchModeScoper::KeywordBatchModeScoper(
-    WebDataService* service)
-    : service_(service) {
-  if (service_)
-    service_->AdjustKeywordBatchModeLevel(true);
-}
-
-WebDataService::KeywordBatchModeScoper::~KeywordBatchModeScoper() {
-  if (service_)
-    service_->AdjustKeywordBatchModeLevel(false);
-}
-
 WebDataService::WebDataService(scoped_refptr<WebDatabaseService> wdbs,
                                const ProfileErrorCallback& callback)
     : WebDataServiceBase(
           wdbs, callback,
-          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)),
-      keyword_batch_mode_level_(0) {
-}
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// Keywords.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-void WebDataService::AddKeyword(const TemplateURLData& data) {
-  if (keyword_batch_mode_level_) {
-    queued_keyword_operations_.push_back(
-        KeywordTable::Operation(KeywordTable::ADD, data));
-  } else {
-    AdjustKeywordBatchModeLevel(true);
-    AddKeyword(data);
-    AdjustKeywordBatchModeLevel(false);
-  }
-}
-
-void WebDataService::RemoveKeyword(TemplateURLID id) {
-  if (keyword_batch_mode_level_) {
-    TemplateURLData data;
-    data.id = id;
-    queued_keyword_operations_.push_back(
-        KeywordTable::Operation(KeywordTable::REMOVE, data));
-  } else {
-    AdjustKeywordBatchModeLevel(true);
-    RemoveKeyword(id);
-    AdjustKeywordBatchModeLevel(false);
-  }
-}
-
-void WebDataService::UpdateKeyword(const TemplateURLData& data) {
-  if (keyword_batch_mode_level_) {
-    queued_keyword_operations_.push_back(
-        KeywordTable::Operation(KeywordTable::UPDATE, data));
-  } else {
-    AdjustKeywordBatchModeLevel(true);
-    UpdateKeyword(data);
-    AdjustKeywordBatchModeLevel(false);
-  }
-}
-
-WebDataServiceBase::Handle WebDataService::GetKeywords(
-    WebDataServiceConsumer* consumer) {
-  return wdbs_->ScheduleDBTaskWithResult(
-      FROM_HERE, Bind(&WebDataService::GetKeywordsImpl, this), consumer);
-}
-
-void WebDataService::SetDefaultSearchProviderID(TemplateURLID id) {
-  wdbs_->ScheduleDBTask(
-      FROM_HERE,
-      Bind(&WebDataService::SetDefaultSearchProviderIDImpl, this, id));
-}
-
-void WebDataService::SetBuiltinKeywordVersion(int version) {
-  wdbs_->ScheduleDBTask(
-      FROM_HERE,
-      Bind(&WebDataService::SetBuiltinKeywordVersionImpl, this, version));
+          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)) {
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -155,68 +69,10 @@ WebDataServiceBase::Handle WebDataService::GetWebAppImages(
 WebDataService::WebDataService()
     : WebDataServiceBase(
           NULL, ProfileErrorCallback(),
-          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)),
-      keyword_batch_mode_level_(0) {
+          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)) {
 }
 
 WebDataService::~WebDataService() {
-  DCHECK(!keyword_batch_mode_level_);
-}
-
-void WebDataService::AdjustKeywordBatchModeLevel(bool entering_batch_mode) {
-  if (entering_batch_mode) {
-    ++keyword_batch_mode_level_;
-  } else {
-    DCHECK(keyword_batch_mode_level_);
-    --keyword_batch_mode_level_;
-    if (!keyword_batch_mode_level_ && !queued_keyword_operations_.empty()) {
-      wdbs_->ScheduleDBTask(
-          FROM_HERE,
-          Bind(&WebDataService::PerformKeywordOperationsImpl, this,
-               queued_keyword_operations_));
-      queued_keyword_operations_.clear();
-    }
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// Keywords implementation.
-//
-////////////////////////////////////////////////////////////////////////////////
-
-WebDatabase::State WebDataService::PerformKeywordOperationsImpl(
-    const KeywordTable::Operations& operations,
-    WebDatabase* db) {
-  return KeywordTable::FromWebDatabase(db)->PerformOperations(operations) ?
-      WebDatabase::COMMIT_NEEDED : WebDatabase::COMMIT_NOT_NEEDED;
-}
-
-scoped_ptr<WDTypedResult> WebDataService::GetKeywordsImpl(WebDatabase* db) {
-  scoped_ptr<WDTypedResult> result_ptr;
-  WDKeywordsResult result;
-  if (KeywordTable::FromWebDatabase(db)->GetKeywords(&result.keywords)) {
-    result.default_search_provider_id =
-        KeywordTable::FromWebDatabase(db)->GetDefaultSearchProviderID();
-    result.builtin_keyword_version =
-        KeywordTable::FromWebDatabase(db)->GetBuiltinKeywordVersion();
-    result_ptr.reset(new WDResult<WDKeywordsResult>(KEYWORDS_RESULT, result));
-  }
-  return result_ptr.Pass();
-}
-
-WebDatabase::State WebDataService::SetDefaultSearchProviderIDImpl(
-    TemplateURLID id,
-    WebDatabase* db) {
-  return KeywordTable::FromWebDatabase(db)->SetDefaultSearchProviderID(id) ?
-      WebDatabase::COMMIT_NEEDED : WebDatabase::COMMIT_NOT_NEEDED;
-}
-
-WebDatabase::State WebDataService::SetBuiltinKeywordVersionImpl(
-    int version,
-    WebDatabase* db) {
-  return KeywordTable::FromWebDatabase(db)->SetBuiltinKeywordVersion(version) ?
-      WebDatabase::COMMIT_NEEDED : WebDatabase::COMMIT_NOT_NEEDED;
 }
 
 ////////////////////////////////////////////////////////////////////////////////