Move AutofillWebData DB methods into separate class

components/autofill/browser/webdata/autofill_webdata_service.cc

Index: components/autofill/browser/webdata/autofill_webdata_service.cc
diff --git a/components/autofill/browser/webdata/autofill_webdata_service.cc b/components/autofill/browser/webdata/autofill_webdata_service.cc
index f4bc67ad78d820446f0f4773837444c25628bc88..09ee63ff00fe0f9de762349a9e8cd8561bdc7cdc 100644
--- a/components/autofill/browser/webdata/autofill_webdata_service.cc
+++ b/components/autofill/browser/webdata/autofill_webdata_service.cc
@@ -12,6 +12,7 @@
 #include "components/autofill/browser/webdata/autofill_change.h"
 #include "components/autofill/browser/webdata/autofill_entry.h"
 #include "components/autofill/browser/webdata/autofill_table.h"
+#include "components/autofill/browser/webdata/autofill_webdata_backend.h"
 #include "components/autofill/browser/webdata/autofill_webdata_service_observer.h"
 #include "components/autofill/common/form_field_data.h"
 #include "components/webdata/common/web_database_service.h"
@@ -39,12 +40,14 @@ void AutofillWebDataService::NotifyOfMultipleAutofillChanges(
 AutofillWebDataService::AutofillWebDataService(
     scoped_refptr<WebDatabaseService> wdbs,
     const ProfileErrorCallback& callback)
-    : WebDataServiceBase(wdbs, callback)  {
+    : WebDataServiceBase(wdbs, callback),
+      autofill_backend_(new AutofillWebDataBackend()) {
 }
 
 AutofillWebDataService::AutofillWebDataService()
     : WebDataServiceBase(NULL,
-                         WebDataServiceBase::ProfileErrorCallback()) {
+                         WebDataServiceBase::ProfileErrorCallback()),
+      autofill_backend_(new AutofillWebDataBackend()) {
 }
 
 void AutofillWebDataService::ShutdownOnUIThread() {
@@ -57,85 +60,93 @@ void AutofillWebDataService::ShutdownOnUIThread() {
 void AutofillWebDataService::AddFormFields(
     const std::vector<FormFieldData>& fields) {
   wdbs_->ScheduleDBTask(FROM_HERE,
-      Bind(&AutofillWebDataService::AddFormElementsImpl, this, fields));
+      Bind(&AutofillWebDataBackend::AddFormElements,
+           autofill_backend_, fields));
 }
 
 WebDataServiceBase::Handle AutofillWebDataService::GetFormValuesForElementName(
     const base::string16& name, const base::string16& prefix, int limit,
     WebDataServiceConsumer* consumer) {
   return wdbs_->ScheduleDBTaskWithResult(FROM_HERE,
-      Bind(&AutofillWebDataService::GetFormValuesForElementNameImpl,
-           this, name, prefix, limit), consumer);
+      Bind(&AutofillWebDataBackend::GetFormValuesForElementName,
+           autofill_backend_, name, prefix, limit), consumer);
 }
 
 void AutofillWebDataService::RemoveFormElementsAddedBetween(
     const Time& delete_begin, const Time& delete_end) {
   wdbs_->ScheduleDBTask(FROM_HERE,
-      Bind(&AutofillWebDataService::RemoveFormElementsAddedBetweenImpl,
-           this, delete_begin, delete_end));
+      Bind(&AutofillWebDataBackend::RemoveFormElementsAddedBetween,
+           autofill_backend_, delete_begin, delete_end));
 }
 
 void AutofillWebDataService::RemoveExpiredFormElements() {
   wdbs_->ScheduleDBTask(FROM_HERE,
-      Bind(&AutofillWebDataService::RemoveExpiredFormElementsImpl, this));
+      Bind(&AutofillWebDataBackend::RemoveExpiredFormElements,
+           autofill_backend_));
 }
 
 void AutofillWebDataService::RemoveFormValueForElementName(
     const base::string16& name, const base::string16& value) {
   wdbs_->ScheduleDBTask(FROM_HERE,
-      Bind(&AutofillWebDataService::RemoveFormValueForElementNameImpl,
-           this, name, value));
+      Bind(&AutofillWebDataBackend::RemoveFormValueForElementName,
+           autofill_backend_, name, value));
 }
 
 void AutofillWebDataService::AddAutofillProfile(
     const AutofillProfile& profile) {
   wdbs_->ScheduleDBTask(FROM_HERE,
-      Bind(&AutofillWebDataService::AddAutofillProfileImpl, this, profile));
+      Bind(&AutofillWebDataBackend::AddAutofillProfile,
+           autofill_backend_, profile));
 }
 
 void AutofillWebDataService::UpdateAutofillProfile(
     const AutofillProfile& profile) {
   wdbs_->ScheduleDBTask(FROM_HERE,
-      Bind(&AutofillWebDataService::UpdateAutofillProfileImpl,
-           this, profile));
+      Bind(&AutofillWebDataBackend::UpdateAutofillProfile,
+           autofill_backend_, profile));
 }
 
 void AutofillWebDataService::RemoveAutofillProfile(
     const std::string& guid) {
   wdbs_->ScheduleDBTask(FROM_HERE,
-      Bind(&AutofillWebDataService::RemoveAutofillProfileImpl, this, guid));
+      Bind(&AutofillWebDataBackend::RemoveAutofillProfile,
+           autofill_backend_, guid));
 }
 
 WebDataServiceBase::Handle AutofillWebDataService::GetAutofillProfiles(
     WebDataServiceConsumer* consumer) {
   return wdbs_->ScheduleDBTaskWithResult(FROM_HERE,
-      Bind(&AutofillWebDataService::GetAutofillProfilesImpl, this),
+      Bind(&AutofillWebDataBackend::GetAutofillProfiles, autofill_backend_),
       consumer);
 }
 
 void AutofillWebDataService::AddCreditCard(const CreditCard& credit_card) {
   wdbs_->ScheduleDBTask(
       FROM_HERE,
-      Bind(&AutofillWebDataService::AddCreditCardImpl, this, credit_card));
+      Bind(&AutofillWebDataBackend::AddCreditCard,
+           autofill_backend_, credit_card));
 }
 
 void AutofillWebDataService::UpdateCreditCard(
     const CreditCard& credit_card) {
   wdbs_->ScheduleDBTask(
       FROM_HERE,
-      Bind(&AutofillWebDataService::UpdateCreditCardImpl, this, credit_card));
+      Bind(&AutofillWebDataBackend::UpdateCreditCard,
+           autofill_backend_, credit_card));
 }
 
 void AutofillWebDataService::RemoveCreditCard(const std::string& guid) {
   wdbs_->ScheduleDBTask(
       FROM_HERE,
-      Bind(&AutofillWebDataService::RemoveCreditCardImpl, this, guid));
+      Bind(&AutofillWebDataBackend::RemoveCreditCard,
+           autofill_backend_, guid));

[Ilya Sherman, 2013/04/30 23:52:11]

nit: Looks like this fits on the previous line

[Cait (Slow), 2013/05/01 23:14:20]

Done.

 }
 
 WebDataServiceBase::Handle AutofillWebDataService::GetCreditCards(
     WebDataServiceConsumer* consumer) {
   return wdbs_->ScheduleDBTaskWithResult(FROM_HERE,
-      Bind(&AutofillWebDataService::GetCreditCardsImpl, this), consumer);
+      Bind(&AutofillWebDataBackend::GetCreditCards, autofill_backend_),
+      consumer);
 }
 
 void AutofillWebDataService::RemoveAutofillDataModifiedBetween(
@@ -143,20 +154,22 @@ void AutofillWebDataService::RemoveAutofillDataModifiedBetween(
     const Time& delete_end) {
   wdbs_->ScheduleDBTask(
       FROM_HERE,
-      Bind(&AutofillWebDataService::RemoveAutofillDataModifiedBetweenImpl,
-           this, delete_begin, delete_end));
+      Bind(&AutofillWebDataBackend::RemoveAutofillDataModifiedBetween,
+           autofill_backend_, delete_begin, delete_end));
 }
 
 void AutofillWebDataService::AddObserver(
     AutofillWebDataServiceObserverOnDBThread* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  db_observer_list_.AddObserver(observer);
+  if (autofill_backend_)
+    autofill_backend_->AddObserver(observer);
 }
 
 void AutofillWebDataService::RemoveObserver(
     AutofillWebDataServiceObserverOnDBThread* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  db_observer_list_.RemoveObserver(observer);
+  if (autofill_backend_)
+    autofill_backend_->RemoveObserver(observer);
 }
 
 void AutofillWebDataService::AddObserver(
@@ -184,288 +197,7 @@ void AutofillWebDataService::ShutdownOnDBThread() {
 }
 
 AutofillWebDataService::~AutofillWebDataService() {
-   DCHECK(!db_thread_user_data_.get()) << "Forgot to call ShutdownOnUIThread?";
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// Autofill implementation.
-//
-////////////////////////////////////////////////////////////////////////////////
-
-WebDatabase::State AutofillWebDataService::AddFormElementsImpl(
-    const std::vector<FormFieldData>& fields, WebDatabase* db) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  AutofillChangeList changes;
-  if (!AutofillTable::FromWebDatabase(db)->AddFormFieldValues(
-        fields, &changes)) {
-    NOTREACHED();
-    return WebDatabase::COMMIT_NOT_NEEDED;
-  }
-
-  // Post the notifications including the list of affected keys.
-  // This is sent here so that work resulting from this notification will be
-  // done on the DB thread, and not the UI thread.
-  FOR_EACH_OBSERVER(AutofillWebDataServiceObserverOnDBThread,
-                    db_observer_list_,
-                    AutofillEntriesChanged(changes));
-
-  return WebDatabase::COMMIT_NEEDED;
-}
-
-scoped_ptr<WDTypedResult>
-AutofillWebDataService::GetFormValuesForElementNameImpl(
-    const base::string16& name, const base::string16& prefix, int limit,
-    WebDatabase* db) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  std::vector<base::string16> values;
-  AutofillTable::FromWebDatabase(db)->GetFormValuesForElementName(
-      name, prefix, &values, limit);
-  return scoped_ptr<WDTypedResult>(
-      new WDResult<std::vector<base::string16> >(AUTOFILL_VALUE_RESULT,
-                                                 values));
-}
-
-WebDatabase::State AutofillWebDataService::RemoveFormElementsAddedBetweenImpl(
-    const base::Time& delete_begin, const base::Time& delete_end,
-    WebDatabase* db) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  AutofillChangeList changes;
-
-  if (AutofillTable::FromWebDatabase(db)->RemoveFormElementsAddedBetween(
-      delete_begin, delete_end, &changes)) {
-    if (!changes.empty()) {
-      // Post the notifications including the list of affected keys.
-      // This is sent here so that work resulting from this notification
-      // will be done on the DB thread, and not the UI thread.
-      FOR_EACH_OBSERVER(AutofillWebDataServiceObserverOnDBThread,
-                        db_observer_list_,
-                        AutofillEntriesChanged(changes));
-    }
-    return WebDatabase::COMMIT_NEEDED;
-  }
-  return WebDatabase::COMMIT_NOT_NEEDED;
-}
-
-WebDatabase::State AutofillWebDataService::RemoveExpiredFormElementsImpl(
-    WebDatabase* db) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  AutofillChangeList changes;
-
-  if (AutofillTable::FromWebDatabase(db)->RemoveExpiredFormElements(&changes)) {
-    if (!changes.empty()) {
-      // Post the notifications including the list of affected keys.
-      // This is sent here so that work resulting from this notification
-      // will be done on the DB thread, and not the UI thread.
-      FOR_EACH_OBSERVER(AutofillWebDataServiceObserverOnDBThread,
-                        db_observer_list_,
-                        AutofillEntriesChanged(changes));
-    }
-    return WebDatabase::COMMIT_NEEDED;
-  }
-  return WebDatabase::COMMIT_NOT_NEEDED;
-}
-
-WebDatabase::State AutofillWebDataService::RemoveFormValueForElementNameImpl(
-    const base::string16& name, const base::string16& value, WebDatabase* db) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-
-  if (AutofillTable::FromWebDatabase(db)->RemoveFormElement(name, value)) {
-    AutofillChangeList changes;
-    changes.push_back(
-        AutofillChange(AutofillChange::REMOVE, AutofillKey(name, value)));
-
-    // Post the notifications including the list of affected keys.
-    FOR_EACH_OBSERVER(AutofillWebDataServiceObserverOnDBThread,
-                      db_observer_list_,
-                      AutofillEntriesChanged(changes));
-
-    return WebDatabase::COMMIT_NEEDED;
-  }
-  return WebDatabase::COMMIT_NOT_NEEDED;
-}
-
-WebDatabase::State AutofillWebDataService::AddAutofillProfileImpl(
-    const AutofillProfile& profile, WebDatabase* db) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  if (!AutofillTable::FromWebDatabase(db)->AddAutofillProfile(profile)) {
-    NOTREACHED();
-    return WebDatabase::COMMIT_NOT_NEEDED;
-  }
-
-  // Send GUID-based notification.
-  AutofillProfileChange change(
-      AutofillProfileChange::ADD, profile.guid(), &profile);
-  FOR_EACH_OBSERVER(AutofillWebDataServiceObserverOnDBThread,
-                    db_observer_list_,
-                    AutofillProfileChanged(change));
-
-  return WebDatabase::COMMIT_NEEDED;
-}
-
-WebDatabase::State AutofillWebDataService::UpdateAutofillProfileImpl(
-    const AutofillProfile& profile, WebDatabase* db) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  // Only perform the update if the profile exists.  It is currently
-  // valid to try to update a missing profile.  We simply drop the write and
-  // the caller will detect this on the next refresh.
-  AutofillProfile* original_profile = NULL;
-  if (!AutofillTable::FromWebDatabase(db)->GetAutofillProfile(profile.guid(),
-      &original_profile)) {
-    return WebDatabase::COMMIT_NOT_NEEDED;
-  }
-  scoped_ptr<AutofillProfile> scoped_profile(original_profile);
-
-  if (!AutofillTable::FromWebDatabase(db)->UpdateAutofillProfileMulti(
-        profile)) {
-    NOTREACHED();
-    return WebDatabase::COMMIT_NEEDED;
-  }
-
-  // Send GUID-based notification.
-  AutofillProfileChange change(
-      AutofillProfileChange::UPDATE, profile.guid(), &profile);
-  FOR_EACH_OBSERVER(AutofillWebDataServiceObserverOnDBThread,
-                    db_observer_list_,
-                    AutofillProfileChanged(change));
-
-  return WebDatabase::COMMIT_NEEDED;
-}
-
-WebDatabase::State AutofillWebDataService::RemoveAutofillProfileImpl(
-    const std::string& guid, WebDatabase* db) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  AutofillProfile* profile = NULL;
-  if (!AutofillTable::FromWebDatabase(db)->GetAutofillProfile(guid, &profile)) {
-    NOTREACHED();
-    return WebDatabase::COMMIT_NOT_NEEDED;
-  }
-  scoped_ptr<AutofillProfile> scoped_profile(profile);
-
-  if (!AutofillTable::FromWebDatabase(db)->RemoveAutofillProfile(guid)) {
-    NOTREACHED();
-    return WebDatabase::COMMIT_NOT_NEEDED;
-  }
-
-  // Send GUID-based notification.
-  AutofillProfileChange change(AutofillProfileChange::REMOVE, guid, NULL);
-  FOR_EACH_OBSERVER(AutofillWebDataServiceObserverOnDBThread,
-                    db_observer_list_,
-                    AutofillProfileChanged(change));
-
-  return WebDatabase::COMMIT_NEEDED;
-}
-
-scoped_ptr<WDTypedResult> AutofillWebDataService::GetAutofillProfilesImpl(
-    WebDatabase* db) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  std::vector<AutofillProfile*> profiles;
-  AutofillTable::FromWebDatabase(db)->GetAutofillProfiles(&profiles);
-  return scoped_ptr<WDTypedResult>(
-      new WDDestroyableResult<std::vector<AutofillProfile*> >(
-          AUTOFILL_PROFILES_RESULT,
-          profiles,
-          base::Bind(&AutofillWebDataService::DestroyAutofillProfileResult,
-              base::Unretained(this))));
-}
-
-WebDatabase::State AutofillWebDataService::AddCreditCardImpl(
-    const CreditCard& credit_card, WebDatabase* db) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  if (!AutofillTable::FromWebDatabase(db)->AddCreditCard(credit_card)) {
-    NOTREACHED();
-    return WebDatabase::COMMIT_NOT_NEEDED;
-  }
-
-  return WebDatabase::COMMIT_NEEDED;
-}
-
-WebDatabase::State AutofillWebDataService::UpdateCreditCardImpl(
-    const CreditCard& credit_card, WebDatabase* db) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  // It is currently valid to try to update a missing profile.  We simply drop
-  // the write and the caller will detect this on the next refresh.
-  CreditCard* original_credit_card = NULL;
-  if (!AutofillTable::FromWebDatabase(db)->GetCreditCard(credit_card.guid(),
-      &original_credit_card)) {
-    return WebDatabase::COMMIT_NOT_NEEDED;
-  }
-  scoped_ptr<CreditCard> scoped_credit_card(original_credit_card);
-
-  if (!AutofillTable::FromWebDatabase(db)->UpdateCreditCard(credit_card)) {
-    NOTREACHED();
-    return WebDatabase::COMMIT_NOT_NEEDED;
-  }
-  return WebDatabase::COMMIT_NEEDED;
-}
-
-WebDatabase::State AutofillWebDataService::RemoveCreditCardImpl(
-    const std::string& guid, WebDatabase* db) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  if (!AutofillTable::FromWebDatabase(db)->RemoveCreditCard(guid)) {
-    NOTREACHED();
-    return WebDatabase::COMMIT_NOT_NEEDED;
-  }
-  return WebDatabase::COMMIT_NEEDED;
-}
-
-scoped_ptr<WDTypedResult> AutofillWebDataService::GetCreditCardsImpl(
-    WebDatabase* db) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  std::vector<CreditCard*> credit_cards;
-  AutofillTable::FromWebDatabase(db)->GetCreditCards(&credit_cards);
-  return scoped_ptr<WDTypedResult>(
-      new WDDestroyableResult<std::vector<CreditCard*> >(
-          AUTOFILL_CREDITCARDS_RESULT,
-          credit_cards,
-        base::Bind(&AutofillWebDataService::DestroyAutofillCreditCardResult,
-              base::Unretained(this))));
-}
-
-WebDatabase::State
-    AutofillWebDataService::RemoveAutofillDataModifiedBetweenImpl(
-        const base::Time& delete_begin,
-        const base::Time& delete_end,
-        WebDatabase* db) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  std::vector<std::string> profile_guids;
-  std::vector<std::string> credit_card_guids;
-  if (AutofillTable::FromWebDatabase(db)->RemoveAutofillDataModifiedBetween(
-          delete_begin,
-          delete_end,
-          &profile_guids,
-          &credit_card_guids)) {
-    for (std::vector<std::string>::iterator iter = profile_guids.begin();
-         iter != profile_guids.end(); ++iter) {
-      AutofillProfileChange change(AutofillProfileChange::REMOVE, *iter, NULL);
-      FOR_EACH_OBSERVER(AutofillWebDataServiceObserverOnDBThread,
-                        db_observer_list_,
-                        AutofillProfileChanged(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;
-}
-
-void AutofillWebDataService::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 AutofillWebDataService::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);
+  DCHECK(!db_thread_user_data_.get()) << "Forgot to call ShutdownOnUIThread?";
 }
 
 void AutofillWebDataService::NotifyAutofillMultipleChangedOnUIThread() {