Split keyword related parts of WebDataService as KeywordWebDataService

chrome/browser/webdata/keyword_web_data_service.cc

Index: chrome/browser/webdata/keyword_web_data_service.cc
diff --git a/chrome/browser/webdata/web_data_service.cc b/chrome/browser/webdata/keyword_web_data_service.cc
similarity index 35%
copy from chrome/browser/webdata/web_data_service.cc
copy to chrome/browser/webdata/keyword_web_data_service.cc
index 4ed9c9b03ead22498669a29cb58cf5f2970af21c..aee80592f2e88d73c6d830ac3e7eaa1096c6abba 100644
--- a/chrome/browser/webdata/web_data_service.cc
+++ b/chrome/browser/webdata/keyword_web_data_service.cc
@@ -1,38 +1,16 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.h"
+#include "chrome/browser/webdata/keyword_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"
-#include "components/search_engines/template_url.h"
-#include "components/signin/core/browser/webdata/token_service_table.h"
+#include "components/search_engines/template_url_data.h"
+#include "components/webdata/common/web_data_results.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"
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// WebDataService implementation.
-//
-////////////////////////////////////////////////////////////////////////////////
 
 using base::Bind;
-using base::Time;
-using content::BrowserThread;
-
-WDAppImagesResult::WDAppImagesResult() : has_all_images(false) {}
-
-WDAppImagesResult::~WDAppImagesResult() {}
 
 WDKeywordsResult::WDKeywordsResult()
   : default_search_provider_id(0),
@@ -41,33 +19,27 @@ WDKeywordsResult::WDKeywordsResult()
 
 WDKeywordsResult::~WDKeywordsResult() {}
 
-WebDataService::KeywordBatchModeScoper::KeywordBatchModeScoper(
-    WebDataService* service)
+KeywordWebDataService::KeywordBatchModeScoper::KeywordBatchModeScoper(
+    KeywordWebDataService* service)
     : service_(service) {
   if (service_)
     service_->AdjustKeywordBatchModeLevel(true);
 }
 
-WebDataService::KeywordBatchModeScoper::~KeywordBatchModeScoper() {
+KeywordWebDataService::KeywordBatchModeScoper::~KeywordBatchModeScoper() {
   if (service_)
     service_->AdjustKeywordBatchModeLevel(false);
 }
 
-WebDataService::WebDataService(scoped_refptr<WebDatabaseService> wdbs,
-                               const ProfileErrorCallback& callback)
-    : WebDataServiceBase(
-          wdbs, callback,
-          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)),
+KeywordWebDataService::KeywordWebDataService(
+    scoped_refptr<WebDatabaseService> wdbs,
+    scoped_refptr<base::MessageLoopProxy> ui_thread,
+    const ProfileErrorCallback& callback)
+    : WebDataServiceBase(wdbs, callback, ui_thread),
       keyword_batch_mode_level_(0) {
 }
 
-//////////////////////////////////////////////////////////////////////////////
-//
-// Keywords.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-void WebDataService::AddKeyword(const TemplateURLData& data) {
+void KeywordWebDataService::AddKeyword(const TemplateURLData& data) {
   if (keyword_batch_mode_level_) {
     queued_keyword_operations_.push_back(
         KeywordTable::Operation(KeywordTable::ADD, data));
@@ -78,7 +50,7 @@ void WebDataService::AddKeyword(const TemplateURLData& data) {
   }
 }
 
-void WebDataService::RemoveKeyword(TemplateURLID id) {
+void KeywordWebDataService::RemoveKeyword(TemplateURLID id) {
   if (keyword_batch_mode_level_) {
     TemplateURLData data;
     data.id = id;
@@ -91,7 +63,7 @@ void WebDataService::RemoveKeyword(TemplateURLID id) {
   }
 }
 
-void WebDataService::UpdateKeyword(const TemplateURLData& data) {
+void KeywordWebDataService::UpdateKeyword(const TemplateURLData& data) {
   if (keyword_batch_mode_level_) {
     queued_keyword_operations_.push_back(
         KeywordTable::Operation(KeywordTable::UPDATE, data));
@@ -102,68 +74,31 @@ void WebDataService::UpdateKeyword(const TemplateURLData& data) {
   }
 }
 
-WebDataServiceBase::Handle WebDataService::GetKeywords(
+WebDataServiceBase::Handle KeywordWebDataService::GetKeywords(
     WebDataServiceConsumer* consumer) {
   return wdbs_->ScheduleDBTaskWithResult(
-      FROM_HERE, Bind(&WebDataService::GetKeywordsImpl, this), consumer);
+      FROM_HERE, Bind(&KeywordWebDataService::GetKeywordsImpl, this), consumer);
 }
 
-void WebDataService::SetDefaultSearchProviderID(TemplateURLID id) {
+void KeywordWebDataService::SetDefaultSearchProviderID(TemplateURLID id) {
   wdbs_->ScheduleDBTask(
       FROM_HERE,
-      Bind(&WebDataService::SetDefaultSearchProviderIDImpl, this, id));
+      Bind(&KeywordWebDataService::SetDefaultSearchProviderIDImpl, this, id));
 }
 
-void WebDataService::SetBuiltinKeywordVersion(int version) {
+void KeywordWebDataService::SetBuiltinKeywordVersion(int version) {
   wdbs_->ScheduleDBTask(
       FROM_HERE,
-      Bind(&WebDataService::SetBuiltinKeywordVersionImpl, this, version));
-}
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// Web Apps
-//
-//////////////////////////////////////////////////////////////////////////////
-
-void WebDataService::SetWebAppImage(const GURL& app_url,
-                                    const SkBitmap& image) {
-  wdbs_->ScheduleDBTask(FROM_HERE,
-      Bind(&WebDataService::SetWebAppImageImpl, this, app_url, image));
-}
-
-void WebDataService::SetWebAppHasAllImages(const GURL& app_url,
-                                           bool has_all_images) {
-  wdbs_->ScheduleDBTask(FROM_HERE,
-      Bind(&WebDataService::SetWebAppHasAllImagesImpl, this, app_url,
-           has_all_images));
-}
-
-void WebDataService::RemoveWebApp(const GURL& app_url) {
-  wdbs_->ScheduleDBTask(FROM_HERE,
-      Bind(&WebDataService::RemoveWebAppImpl, this, app_url));
+      Bind(&KeywordWebDataService::SetBuiltinKeywordVersionImpl,
+           this, version));
 }
 
-WebDataServiceBase::Handle WebDataService::GetWebAppImages(
-    const GURL& app_url, WebDataServiceConsumer* consumer) {
-  return wdbs_->ScheduleDBTaskWithResult(FROM_HERE,
-      Bind(&WebDataService::GetWebAppImagesImpl, this, app_url), consumer);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-WebDataService::WebDataService()
-    : WebDataServiceBase(
-          NULL, ProfileErrorCallback(),
-          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)),
-      keyword_batch_mode_level_(0) {
-}
-
-WebDataService::~WebDataService() {
+KeywordWebDataService::~KeywordWebDataService() {
   DCHECK(!keyword_batch_mode_level_);
 }
 
-void WebDataService::AdjustKeywordBatchModeLevel(bool entering_batch_mode) {
+void KeywordWebDataService::AdjustKeywordBatchModeLevel(
+    bool entering_batch_mode) {
   if (entering_batch_mode) {
     ++keyword_batch_mode_level_;
   } else {
@@ -172,27 +107,22 @@ void WebDataService::AdjustKeywordBatchModeLevel(bool entering_batch_mode) {
     if (!keyword_batch_mode_level_ && !queued_keyword_operations_.empty()) {
       wdbs_->ScheduleDBTask(
           FROM_HERE,
-          Bind(&WebDataService::PerformKeywordOperationsImpl, this,
+          Bind(&KeywordWebDataService::PerformKeywordOperationsImpl, this,
                queued_keyword_operations_));
       queued_keyword_operations_.clear();
     }
   }
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//
-// Keywords implementation.
-//
-////////////////////////////////////////////////////////////////////////////////
-
-WebDatabase::State WebDataService::PerformKeywordOperationsImpl(
+WebDatabase::State KeywordWebDataService::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> KeywordWebDataService::GetKeywordsImpl(
+    WebDatabase* db) {
   scoped_ptr<WDTypedResult> result_ptr;
   WDKeywordsResult result;
   if (KeywordTable::FromWebDatabase(db)->GetKeywords(&result.keywords)) {
@@ -205,51 +135,16 @@ scoped_ptr<WDTypedResult> WebDataService::GetKeywordsImpl(WebDatabase* db) {
   return result_ptr.Pass();
 }
 
-WebDatabase::State WebDataService::SetDefaultSearchProviderIDImpl(
+WebDatabase::State KeywordWebDataService::SetDefaultSearchProviderIDImpl(
     TemplateURLID id,
     WebDatabase* db) {
   return KeywordTable::FromWebDatabase(db)->SetDefaultSearchProviderID(id) ?
       WebDatabase::COMMIT_NEEDED : WebDatabase::COMMIT_NOT_NEEDED;
 }
 
-WebDatabase::State WebDataService::SetBuiltinKeywordVersionImpl(
+WebDatabase::State KeywordWebDataService::SetBuiltinKeywordVersionImpl(
     int version,
     WebDatabase* db) {
   return KeywordTable::FromWebDatabase(db)->SetBuiltinKeywordVersion(version) ?
       WebDatabase::COMMIT_NEEDED : WebDatabase::COMMIT_NOT_NEEDED;
 }
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// Web Apps implementation.
-//
-////////////////////////////////////////////////////////////////////////////////
-
-WebDatabase::State WebDataService::SetWebAppImageImpl(
-    const GURL& app_url, const SkBitmap& image, WebDatabase* db) {
-  WebAppsTable::FromWebDatabase(db)->SetWebAppImage(app_url, image);
-  return WebDatabase::COMMIT_NEEDED;
-}
-
-WebDatabase::State WebDataService::SetWebAppHasAllImagesImpl(
-    const GURL& app_url, bool has_all_images, WebDatabase* db) {
-  WebAppsTable::FromWebDatabase(db)->SetWebAppHasAllImages(app_url,
-                                                           has_all_images);
-  return WebDatabase::COMMIT_NEEDED;
-}
-
-WebDatabase::State WebDataService::RemoveWebAppImpl(
-    const GURL& app_url, WebDatabase* db) {
-  WebAppsTable::FromWebDatabase(db)->RemoveWebApp(app_url);
-  return WebDatabase::COMMIT_NEEDED;
-}
-
-scoped_ptr<WDTypedResult> WebDataService::GetWebAppImagesImpl(
-    const GURL& app_url, WebDatabase* db) {
-  WDAppImagesResult result;
-  result.has_all_images =
-      WebAppsTable::FromWebDatabase(db)->GetWebAppHasAllImages(app_url);
-  WebAppsTable::FromWebDatabase(db)->GetWebAppImages(app_url, &result.images);
-  return scoped_ptr<WDTypedResult>(
-      new WDResult<WDAppImagesResult>(WEB_APP_IMAGES, result));
-}