Split Autofill webdata

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 ddc0004810b50c8703b9a016a0ad7a24d68d77bd..265c27afd5a53619e52d2e8fc64984be87497900 100644
--- a/chrome/browser/webdata/web_data_service.cc
+++ b/chrome/browser/webdata/web_data_service.cc
@@ -4,11 +4,10 @@
 
 #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"
@@ -63,9 +62,9 @@ WDKeywordsResult::WDKeywordsResult()
 
 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
@@ -82,18 +81,6 @@ void WebDataService::NotifyOfMultipleAutofillChanges(
            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.
@@ -275,33 +262,11 @@ void WebDataService::RemoveAutofillProfilesAndCreditCardsModifiedBetween(
       this, delete_begin, delete_end));
 }
 
-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);
+WebDataService::WebDataService()
+    : WebDataServiceBase(NULL, ProfileErrorCallback()) {
 }
 
-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;
+WebDataService::~WebDataService() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -674,22 +639,6 @@ WebDataService::RemoveAutofillProfilesAndCreditCardsModifiedBetweenImpl(
   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 =