Rip autofill code out of webdataservice

chrome/browser/webdata/autofill_web_data_service_impl.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/autofill_web_data_service_impl.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "chrome/browser/webdata/autofill_change.h"
 #include "chrome/browser/webdata/autofill_entry.h"
@@ skipping 71 matching lines @@
 
 WebDataServiceBase::Handle
 AutofillWebDataServiceImpl::GetFormValuesForElementName(
     const string16& name, const string16& prefix, int limit,
     WebDataServiceConsumer* consumer) {
   return wdbs_->ScheduleDBTaskWithResult(FROM_HERE,
       Bind(&AutofillWebDataServiceImpl::GetFormValuesForElementNameImpl,
            this, name, prefix, limit), consumer);
 }
 
+void AutofillWebDataServiceImpl::RemoveFormElementsAddedBetween(
+    const Time& delete_begin, const Time& delete_end) {
+  wdbs_->ScheduleDBTask(FROM_HERE,
+      Bind(&AutofillWebDataServiceImpl::RemoveFormElementsAddedBetweenImpl,
+           this, delete_begin, delete_end));
+}
+
 void AutofillWebDataServiceImpl::RemoveExpiredFormElements() {
   wdbs_->ScheduleDBTask(FROM_HERE,
       Bind(&AutofillWebDataServiceImpl::RemoveExpiredFormElementsImpl, this));
 }
 
 void AutofillWebDataServiceImpl::RemoveFormValueForElementName(
     const string16& name, const string16& value) {
   wdbs_->ScheduleDBTask(FROM_HERE,
       Bind(&AutofillWebDataServiceImpl::RemoveFormValueForElementNameImpl,
            this, name, value));
@@ skipping 41 matching lines @@
   wdbs_->ScheduleDBTask(FROM_HERE,
       Bind(&AutofillWebDataServiceImpl::RemoveCreditCardImpl, this, guid));
 }
 
 AutofillWebDataServiceImpl::Handle AutofillWebDataServiceImpl::GetCreditCards(
     WebDataServiceConsumer* consumer) {
   return wdbs_->ScheduleDBTaskWithResult(FROM_HERE,
       Bind(&AutofillWebDataServiceImpl::GetCreditCardsImpl, this), consumer);
 }
 
+void AutofillWebDataServiceImpl::RemoveAutofillDataModifiedBetween(
+    const Time& delete_begin, const Time& delete_end) {
+  wdbs_->ScheduleDBTask(FROM_HERE, Bind(
+&AutofillWebDataServiceImpl::RemoveAutofillDataModifiedBetweenImpl,
+      this, delete_begin, delete_end));
+}
+
 AutofillWebDataServiceImpl::~AutofillWebDataServiceImpl() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // Autofill implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 WebDatabase::State AutofillWebDataServiceImpl::AddFormElementsImpl(
@@ skipping 44 matching lines @@
       content::NotificationService::current()->Notify(
           chrome::NOTIFICATION_AUTOFILL_ENTRIES_CHANGED,
           content::Source<AutofillWebDataService>(this),
           content::Details<AutofillChangeList>(&changes));
     }
     return WebDatabase::COMMIT_NEEDED;
   }
   return WebDatabase::COMMIT_NOT_NEEDED;
 }
 
-WebDatabase::State
-AutofillWebDataServiceImpl::RemoveExpiredFormElementsImpl(
+WebDatabase::State AutofillWebDataServiceImpl::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.
       content::NotificationService::current()->Notify(
@@ skipping 20 matching lines @@
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_AUTOFILL_ENTRIES_CHANGED,
         content::Source<AutofillWebDataService>(this),
         content::Details<AutofillChangeList>(&changes));
 
     return WebDatabase::COMMIT_NEEDED;
   }
   return WebDatabase::COMMIT_NOT_NEEDED;
 }
 
-WebDatabase::State
-AutofillWebDataServiceImpl::AddAutofillProfileImpl(
+WebDatabase::State AutofillWebDataServiceImpl::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);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED,
       content::Source<AutofillWebDataService>(this),
       content::Details<AutofillProfileChange>(&change));
 
   return WebDatabase::COMMIT_NEEDED;
 }
 
-WebDatabase::State
-AutofillWebDataServiceImpl::UpdateAutofillProfileImpl(
+WebDatabase::State AutofillWebDataServiceImpl::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);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED,
       content::Source<AutofillWebDataService>(this),
       content::Details<AutofillProfileChange>(&change));
 
   return WebDatabase::COMMIT_NEEDED;
 }
 
-WebDatabase::State
-AutofillWebDataServiceImpl::RemoveAutofillProfileImpl(
+WebDatabase::State AutofillWebDataServiceImpl::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);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED,
       content::Source<AutofillWebDataService>(this),
       content::Details<AutofillProfileChange>(&change));
 
   return WebDatabase::COMMIT_NEEDED;
 }
 
-scoped_ptr<WDTypedResult>
-AutofillWebDataServiceImpl::GetAutofillProfilesImpl(
+scoped_ptr<WDTypedResult> AutofillWebDataServiceImpl::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(&AutofillWebDataServiceImpl::DestroyAutofillProfileResult,
               base::Unretained(this))));
 }
 
-WebDatabase::State
-AutofillWebDataServiceImpl::AddCreditCardImpl(
+WebDatabase::State AutofillWebDataServiceImpl::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
-AutofillWebDataServiceImpl::UpdateCreditCardImpl(
+WebDatabase::State AutofillWebDataServiceImpl::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
-AutofillWebDataServiceImpl::RemoveCreditCardImpl(
+WebDatabase::State AutofillWebDataServiceImpl::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>
-AutofillWebDataServiceImpl::GetCreditCardsImpl(WebDatabase* db) {
+scoped_ptr<WDTypedResult> AutofillWebDataServiceImpl::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(&AutofillWebDataServiceImpl::DestroyAutofillCreditCardResult,
               base::Unretained(this))));
 }
 
+WebDatabase::State
+AutofillWebDataServiceImpl::RemoveAutofillDataModifiedBetweenImpl(
+        const base::Time& delete_begin, const base::Time& delete_end,
+        WebDatabase* 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);
+      content::NotificationService::current()->Notify(
+          chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED,
+          content::Source<AutofillWebDataService>(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;
+}
+
 void AutofillWebDataServiceImpl::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 AutofillWebDataServiceImpl::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);
 }