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/autocomplete_syncable_service.h"
 #include "chrome/browser/webdata/autofill_change.h"
 #include "chrome/browser/webdata/autofill_entry.h"
-#include "chrome/browser/webdata/autofill_profile_syncable_service.h"
 #include "chrome/browser/webdata/autofill_table.h"
 #include "chrome/browser/webdata/keyword_table.h"
 #include "chrome/browser/webdata/logins_table.h"
 #include "chrome/browser/webdata/token_service_table.h"
 #include "chrome/browser/webdata/web_apps_table.h"
 #include "chrome/browser/webdata/web_database_service.h"
 #include "chrome/browser/webdata/web_intents_table.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "components/autofill/browser/autofill_country.h"
 #include "components/autofill/browser/autofill_profile.h"
@@ skipping 34 matching lines @@
 
 WDAppImagesResult::~WDAppImagesResult() {}
 
 WDKeywordsResult::WDKeywordsResult()
   : default_search_provider_id(0),
     builtin_keyword_version(0) {
 }
 
 WDKeywordsResult::~WDKeywordsResult() {}
 
-WebDataService::WebDataService()
-    : autocomplete_syncable_service_(NULL),
-      autofill_profile_syncable_service_(NULL) {
+WebDataService::WebDataService(scoped_refptr<WebDatabaseService> wdbs,

[Jói, 2013/03/19 20:53:58]

Indentation again; both indent to ( or both indent +4 from line above

[Cait (Slow), 2013/03/20 22:21:10]

Done.

+    const ProfileErrorCallback& callback)
+    : WebDataServiceBase(wdbs, callback) {
 }
 
 // static
 void WebDataService::NotifyOfMultipleAutofillChanges(
     WebDataService* web_data_service) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
 
   if (!web_data_service)
     return;
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       Bind(&NotifyOfMultipleAutofillChangesTask,
            make_scoped_refptr(web_data_service)));
 }
 
-void WebDataService::ShutdownOnUIThread() {
-  BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-      Bind(&WebDataService::ShutdownSyncableServices, this));
-  WebDataServiceBase::ShutdownOnUIThread();
-}
-
-void WebDataService::Init(const base::FilePath& path) {
-  WebDataServiceBase::Init(path);
-  BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-      Bind(&WebDataService::InitializeSyncableServices, this));
-}
-
 //////////////////////////////////////////////////////////////////////////////
 //
 // Keywords.
 //
 //////////////////////////////////////////////////////////////////////////////
 
 void WebDataService::AddKeyword(const TemplateURLData& data) {
   wdbs_->ScheduleDBTask(
       FROM_HERE, Bind(&WebDataService::AddKeywordImpl, this, data));
 }
@@ skipping 161 matching lines @@
 }
 
 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(NULL, ProfileErrorCallback()) {
+}
+
 WebDataService::~WebDataService() {
-  DCHECK(!autocomplete_syncable_service_);
-  DCHECK(!autofill_profile_syncable_service_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-//
-// The following methods are executed on the DB thread.
-//
-////////////////////////////////////////////////////////////////////////////////
-
-void WebDataService::InitializeSyncableServices() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  DCHECK(!autocomplete_syncable_service_);
-  DCHECK(!autofill_profile_syncable_service_);
-
-  autocomplete_syncable_service_ = new AutocompleteSyncableService(this);
-  autofill_profile_syncable_service_ = new AutofillProfileSyncableService(this);
-}
-
-void WebDataService::ShutdownSyncableServices() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-
-  delete autocomplete_syncable_service_;
-  autocomplete_syncable_service_ = NULL;
-  delete autofill_profile_syncable_service_;
-  autofill_profile_syncable_service_ = NULL;
-}
-
-////////////////////////////////////////////////////////////////////////////////
 //
 // Keywords implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 WebDatabase::State WebDataService::AddKeywordImpl(
     const TemplateURLData& data, WebDatabase* db) {
   db->GetKeywordTable()->AddKeyword(data);
   return WebDatabase::COMMIT_NEEDED;
 }
@@ skipping 349 matching lines @@
           content::Source<WebDataService>(this),
           content::Details<AutofillProfileChange>(&change));
     }
     // Note: It is the caller's responsibility to post notifications for any
     // changes, e.g. by calling the Refresh() method of PersonalDataManager.
     return WebDatabase::COMMIT_NEEDED;
   }
   return WebDatabase::COMMIT_NOT_NEEDED;
 }
 
-AutofillProfileSyncableService*
-    WebDataService::GetAutofillProfileSyncableService() const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  DCHECK(autofill_profile_syncable_service_);  // Make sure we're initialized.
-
-  return autofill_profile_syncable_service_;
-}
-
-AutocompleteSyncableService* WebDataService::GetAutocompleteSyncableService()
-    const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  DCHECK(autocomplete_syncable_service_);  // Make sure we're initialized.
-
-  return autocomplete_syncable_service_;
-}
-
 void WebDataService::DestroyAutofillProfileResult(const WDTypedResult* result) {
   DCHECK(result->GetType() == AUTOFILL_PROFILES_RESULT);
   const WDResult<std::vector<AutofillProfile*> >* r =
       static_cast<const WDResult<std::vector<AutofillProfile*> >*>(result);
   std::vector<AutofillProfile*> profiles = r->GetValue();
   STLDeleteElements(&profiles);
 }
 
 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);
 }