Split Autofill webdata

chrome/browser/webdata/web_data_service.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.h"
 
 #include "base/stl_util.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/webdata/autofill_change.h"
 #include "chrome/browser/webdata/autofill_entry.h"
@@ skipping 44 matching lines @@
 
 WDAppImagesResult::~WDAppImagesResult() {}
 
 WDKeywordsResult::WDKeywordsResult()
   : default_search_provider_id(0),
     builtin_keyword_version(0) {
 }
 
 WDKeywordsResult::~WDKeywordsResult() {}
 
-WebDataService::WebDataService(const base::FilePath& path,
+WebDataService::WebDataService(scoped_refptr<WebDatabaseService> wdbs,
                                const ProfileErrorCallback& callback)
-    : WebDataServiceBase(path, callback) {
+    : WebDataServiceBase(wdbs, callback) {
 }
 
 // static
 void WebDataService::NotifyOfMultipleAutofillChanges(
     WebDataService* web_data_service) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
 
   if (!web_data_service)
     return;
 
@@ skipping 17 matching lines @@
 void WebDataService::RemoveKeyword(TemplateURLID id) {
   wdbs_->ScheduleDBTask(
       FROM_HERE, Bind(&WebDataService::RemoveKeywordImpl, this, id));
 }
 
 void WebDataService::UpdateKeyword(const TemplateURLData& data) {
   wdbs_->ScheduleDBTask(
       FROM_HERE, Bind(&WebDataService::UpdateKeywordImpl, this, data));
 }
 
-WebDataService::Handle WebDataService::GetKeywords(
+WebDataServiceBase::Handle WebDataService::GetKeywords(
     WebDataServiceConsumer* consumer) {
   return wdbs_->ScheduleDBTaskWithResult(FROM_HERE,
       Bind(&WebDataService::GetKeywordsImpl, this), consumer);
 }
 
 void WebDataService::SetDefaultSearchProvider(const TemplateURL* url) {
   wdbs_->ScheduleDBTask(FROM_HERE,
       Bind(&WebDataService::SetDefaultSearchProviderImpl, this,
            url ? url->id() : 0));
 }
@@ skipping 20 matching lines @@
   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));
 }
 
-WebDataService::Handle WebDataService::GetWebAppImages(
+WebDataServiceBase::Handle WebDataService::GetWebAppImages(
     const GURL& app_url, WebDataServiceConsumer* consumer) {
   return wdbs_->ScheduleDBTaskWithResult(FROM_HERE,
       Bind(&WebDataService::GetWebAppImagesImpl, this, app_url), consumer);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // Token Service
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 void WebDataService::SetTokenForService(const std::string& service,
                                         const std::string& token) {
   wdbs_->ScheduleDBTask(FROM_HERE,
       Bind(&WebDataService::SetTokenForServiceImpl, this, service, token));
 }
 
 void WebDataService::RemoveAllTokens() {
   wdbs_->ScheduleDBTask(FROM_HERE,
       Bind(&WebDataService::RemoveAllTokensImpl, this));
 }
 
 // Null on failure. Success is WDResult<std::string>
-WebDataService::Handle WebDataService::GetAllTokens(
+WebDataServiceBase::Handle WebDataService::GetAllTokens(
     WebDataServiceConsumer* consumer) {
   return wdbs_->ScheduleDBTaskWithResult(FROM_HERE,
       Bind(&WebDataService::GetAllTokensImpl, this), consumer);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // Autofill.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 void WebDataService::AddFormFields(
     const std::vector<FormFieldData>& fields) {
   wdbs_->ScheduleDBTask(FROM_HERE,
       Bind(&WebDataService::AddFormElementsImpl, this, fields));
 }
 
-WebDataService::Handle WebDataService::GetFormValuesForElementName(
+WebDataServiceBase::Handle WebDataService::GetFormValuesForElementName(
     const string16& name, const string16& prefix, int limit,
     WebDataServiceConsumer* consumer) {
   return wdbs_->ScheduleDBTaskWithResult(FROM_HERE,
       Bind(&WebDataService::GetFormValuesForElementNameImpl,
            this, name, prefix, limit), consumer);
 }
 
 void WebDataService::RemoveFormElementsAddedBetween(const Time& delete_begin,
                                                     const Time& delete_end) {
   wdbs_->ScheduleDBTask(FROM_HERE,
@@ skipping 21 matching lines @@
 void WebDataService::UpdateAutofillProfile(const AutofillProfile& profile) {
   wdbs_->ScheduleDBTask(FROM_HERE,
       Bind(&WebDataService::UpdateAutofillProfileImpl, this, profile));
 }
 
 void WebDataService::RemoveAutofillProfile(const std::string& guid) {
   wdbs_->ScheduleDBTask(FROM_HERE,
       Bind(&WebDataService::RemoveAutofillProfileImpl, this, guid));
 }
 
-WebDataService::Handle WebDataService::GetAutofillProfiles(
+WebDataServiceBase::Handle WebDataService::GetAutofillProfiles(
     WebDataServiceConsumer* consumer) {
   return wdbs_->ScheduleDBTaskWithResult(FROM_HERE,
       Bind(&WebDataService::GetAutofillProfilesImpl, this), consumer);
 }
 
 void WebDataService::AddCreditCard(const CreditCard& credit_card) {
   wdbs_->ScheduleDBTask(FROM_HERE,
       Bind(&WebDataService::AddCreditCardImpl, this, credit_card));
 }
 
 void WebDataService::UpdateCreditCard(const CreditCard& credit_card) {
   wdbs_->ScheduleDBTask(FROM_HERE,
       Bind(&WebDataService::UpdateCreditCardImpl, this, credit_card));
 }
 
 void WebDataService::RemoveCreditCard(const std::string& guid) {
   wdbs_->ScheduleDBTask(FROM_HERE,
       Bind(&WebDataService::RemoveCreditCardImpl, this, guid));
 }
 
-WebDataService::Handle WebDataService::GetCreditCards(
+WebDataServiceBase::Handle WebDataService::GetCreditCards(
     WebDataServiceConsumer* consumer) {
   return wdbs_->ScheduleDBTaskWithResult(FROM_HERE,
       Bind(&WebDataService::GetCreditCardsImpl, this), consumer);
 }
 
 void WebDataService::RemoveAutofillProfilesAndCreditCardsModifiedBetween(
     const Time& delete_begin,
     const Time& delete_end) {
   wdbs_->ScheduleDBTask(FROM_HERE, Bind(
       &WebDataService::RemoveAutofillProfilesAndCreditCardsModifiedBetweenImpl,
       this, delete_begin, delete_end));
 }
 
 WebDataService::WebDataService()
-    : WebDataServiceBase(base::FilePath(), ProfileErrorCallback()) {
+    : WebDataServiceBase(NULL, ProfileErrorCallback()) {
 }
 
 WebDataService::~WebDataService() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // Keywords implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 376 matching lines @@
 
 void WebDataService::DestroyAutofillCreditCardResult(
       const WDTypedResult* result) {
   DCHECK(result->GetType() == AUTOFILL_CREDITCARDS_RESULT);
   const WDResult<std::vector<CreditCard*> >* r =
       static_cast<const WDResult<std::vector<CreditCard*> >*>(result);
 
   std::vector<CreditCard*> credit_cards = r->GetValue();
   STLDeleteElements(&credit_cards);
 }