Rename AutofillWebDataServiceImpl --> AutofillWebDataService.

chrome/browser/webdata/autofill_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/autofill_web_data_service_impl.h"
+#include "chrome/browser/webdata/autofill_web_data_service.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "chrome/browser/webdata/autofill_change.h"
 #include "chrome/browser/webdata/autofill_entry.h"
 #include "chrome/browser/webdata/autofill_table.h"
 #include "chrome/browser/webdata/web_database_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "components/autofill/browser/autofill_country.h"
 #include "components/autofill/browser/autofill_profile.h"
@@ skipping 40 matching lines @@
     scoped_refptr<WebDatabaseService> wdbs,
     const ProfileErrorCallback& callback)
     : WebDataServiceBase(wdbs, callback)  {
 }
 
 AutofillWebDataService::AutofillWebDataService()
     : WebDataServiceBase(NULL,
                          WebDataServiceBase::ProfileErrorCallback()) {
 }
 
-AutofillWebDataServiceImpl::AutofillWebDataServiceImpl(
-    scoped_refptr<WebDatabaseService> wdbs,
-    const ProfileErrorCallback& callback)
-    : AutofillWebDataService(wdbs, callback) {
-}
-
 content::NotificationSource
-AutofillWebDataServiceImpl::GetNotificationSource() {
+AutofillWebDataService::GetNotificationSource() {
   return content::Source<AutofillWebDataService>(this);
 }
 
-void AutofillWebDataServiceImpl::AddFormFields(
+void AutofillWebDataService::AddFormFields(
     const std::vector<FormFieldData>& fields) {
   wdbs_->ScheduleDBTask(FROM_HERE,
-      Bind(&AutofillWebDataServiceImpl::AddFormElementsImpl, this, fields));
+      Bind(&AutofillWebDataService::AddFormElementsImpl, this, fields));
 }
 
 WebDataServiceBase::Handle
-AutofillWebDataServiceImpl::GetFormValuesForElementName(
+AutofillWebDataService::GetFormValuesForElementName(
     const string16& name, const string16& prefix, int limit,
     WebDataServiceConsumer* consumer) {
   return wdbs_->ScheduleDBTaskWithResult(FROM_HERE,
-      Bind(&AutofillWebDataServiceImpl::GetFormValuesForElementNameImpl,
+      Bind(&AutofillWebDataService::GetFormValuesForElementNameImpl,
            this, name, prefix, limit), consumer);
 }
 
-void AutofillWebDataServiceImpl::RemoveExpiredFormElements() {
+void AutofillWebDataService::RemoveExpiredFormElements() {
   wdbs_->ScheduleDBTask(FROM_HERE,
-      Bind(&AutofillWebDataServiceImpl::RemoveExpiredFormElementsImpl, this));
+      Bind(&AutofillWebDataService::RemoveExpiredFormElementsImpl, this));
 }
 
-void AutofillWebDataServiceImpl::RemoveFormValueForElementName(
+void AutofillWebDataService::RemoveFormValueForElementName(
     const string16& name, const string16& value) {
   wdbs_->ScheduleDBTask(FROM_HERE,
-      Bind(&AutofillWebDataServiceImpl::RemoveFormValueForElementNameImpl,
+      Bind(&AutofillWebDataService::RemoveFormValueForElementNameImpl,
            this, name, value));
 }
 
-void AutofillWebDataServiceImpl::AddAutofillProfile(
+void AutofillWebDataService::AddAutofillProfile(
     const AutofillProfile& profile) {
   wdbs_->ScheduleDBTask(FROM_HERE,
-      Bind(&AutofillWebDataServiceImpl::AddAutofillProfileImpl, this, profile));
+      Bind(&AutofillWebDataService::AddAutofillProfileImpl, this, profile));
 }
 
-void AutofillWebDataServiceImpl::UpdateAutofillProfile(
+void AutofillWebDataService::UpdateAutofillProfile(
     const AutofillProfile& profile) {
   wdbs_->ScheduleDBTask(FROM_HERE,
-      Bind(&AutofillWebDataServiceImpl::UpdateAutofillProfileImpl,
+      Bind(&AutofillWebDataService::UpdateAutofillProfileImpl,
            this, profile));
 }
 
-void AutofillWebDataServiceImpl::RemoveAutofillProfile(
+void AutofillWebDataService::RemoveAutofillProfile(
     const std::string& guid) {
   wdbs_->ScheduleDBTask(FROM_HERE,
-      Bind(&AutofillWebDataServiceImpl::RemoveAutofillProfileImpl, this, guid));
+      Bind(&AutofillWebDataService::RemoveAutofillProfileImpl, this, guid));
 }
 
-WebDataServiceBase::Handle AutofillWebDataServiceImpl::GetAutofillProfiles(
+WebDataServiceBase::Handle AutofillWebDataService::GetAutofillProfiles(
     WebDataServiceConsumer* consumer) {
   return wdbs_->ScheduleDBTaskWithResult(FROM_HERE,
-      Bind(&AutofillWebDataServiceImpl::GetAutofillProfilesImpl, this),
+      Bind(&AutofillWebDataService::GetAutofillProfilesImpl, this),
       consumer);
 }
 
-void AutofillWebDataServiceImpl::AddCreditCard(const CreditCard& credit_card) {
+void AutofillWebDataService::AddCreditCard(const CreditCard& credit_card) {
   wdbs_->ScheduleDBTask(FROM_HERE,
-      Bind(&AutofillWebDataServiceImpl::AddCreditCardImpl, this, credit_card));
+      Bind(&AutofillWebDataService::AddCreditCardImpl, this, credit_card));
 }
 
-void AutofillWebDataServiceImpl::UpdateCreditCard(
+void AutofillWebDataService::UpdateCreditCard(
     const CreditCard& credit_card) {
   wdbs_->ScheduleDBTask(FROM_HERE,
-      Bind(&AutofillWebDataServiceImpl::UpdateCreditCardImpl, this,
+      Bind(&AutofillWebDataService::UpdateCreditCardImpl, this,
            credit_card));
 }
 
-void AutofillWebDataServiceImpl::RemoveCreditCard(const std::string& guid) {
+void AutofillWebDataService::RemoveCreditCard(const std::string& guid) {
   wdbs_->ScheduleDBTask(FROM_HERE,
-      Bind(&AutofillWebDataServiceImpl::RemoveCreditCardImpl, this, guid));
+      Bind(&AutofillWebDataService::RemoveCreditCardImpl, this, guid));
 }
 
-AutofillWebDataServiceImpl::Handle AutofillWebDataServiceImpl::GetCreditCards(
+WebDataServiceBase::Handle AutofillWebDataService::GetCreditCards(
     WebDataServiceConsumer* consumer) {
   return wdbs_->ScheduleDBTaskWithResult(FROM_HERE,
-      Bind(&AutofillWebDataServiceImpl::GetCreditCardsImpl, this), consumer);
+      Bind(&AutofillWebDataService::GetCreditCardsImpl, this), consumer);
 }
 
-void AutofillWebDataServiceImpl::RemoveFormElementsAddedBetween(
+void AutofillWebDataService::RemoveFormElementsAddedBetween(
     const Time& delete_begin, const Time& delete_end) {
   wdbs_->ScheduleDBTask(FROM_HERE,
-      Bind(&AutofillWebDataServiceImpl::RemoveFormElementsAddedBetweenImpl,
+      Bind(&AutofillWebDataService::RemoveFormElementsAddedBetweenImpl,
            this, delete_begin, delete_end));
 }
 
 void
-AutofillWebDataServiceImpl::RemoveAutofillProfilesAndCreditCardsModifiedBetween(
+AutofillWebDataService::RemoveAutofillProfilesAndCreditCardsModifiedBetween(
     const Time& delete_begin, const Time& delete_end) {
   wdbs_->ScheduleDBTask(FROM_HERE, Bind(
-&AutofillWebDataServiceImpl::RemoveAutofillProfilesAndCreditCardsModifiedBetweenImpl,
+&AutofillWebDataService::RemoveAutofillProfilesAndCreditCardsModifiedBetweenImpl,
       this, delete_begin, delete_end));
 }
 
-AutofillWebDataServiceImpl::~AutofillWebDataServiceImpl() {
+AutofillWebDataService::~AutofillWebDataService() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // Autofill implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-WebDatabase::State AutofillWebDataServiceImpl::AddFormElementsImpl(
+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.
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_AUTOFILL_ENTRIES_CHANGED,
       content::Source<AutofillWebDataService>(this),
       content::Details<AutofillChangeList>(&changes));
 
   return WebDatabase::COMMIT_NEEDED;
 }
 
 scoped_ptr<WDTypedResult>
-AutofillWebDataServiceImpl::GetFormValuesForElementNameImpl(
+AutofillWebDataService::GetFormValuesForElementNameImpl(
     const string16& name, const string16& prefix, int limit, WebDatabase* db) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   std::vector<string16> values;
   AutofillTable::FromWebDatabase(db)->GetFormValuesForElementName(
       name, prefix, &values, limit);
   return scoped_ptr<WDTypedResult>(
       new WDResult<std::vector<string16> >(AUTOFILL_VALUE_RESULT, values));
 }
 
 WebDatabase::State
-AutofillWebDataServiceImpl::RemoveFormElementsAddedBetweenImpl(
+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.
       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(
+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.
       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::RemoveFormValueForElementNameImpl(
+AutofillWebDataService::RemoveFormValueForElementNameImpl(
     const string16& name, const 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.
     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(
+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);
   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(
+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;
   }
@@ skipping 10 matching lines @@
                                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(
+AutofillWebDataService::RemoveAutofillProfileImpl(

[kaiwang, 2013/03/25 23:21:25]

one line?
Also applies to functions below

[Cait (Slow), 2013/03/26 14:55:03]

Done.

     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(
+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(&AutofillWebDataServiceImpl::DestroyAutofillProfileResult,
+          base::Bind(&AutofillWebDataService::DestroyAutofillProfileResult,
               base::Unretained(this))));
 }
 
 WebDatabase::State
-AutofillWebDataServiceImpl::AddCreditCardImpl(
+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
-AutofillWebDataServiceImpl::UpdateCreditCardImpl(
+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
-AutofillWebDataServiceImpl::RemoveCreditCardImpl(
+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>
-AutofillWebDataServiceImpl::GetCreditCardsImpl(WebDatabase* db) {
+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(&AutofillWebDataServiceImpl::DestroyAutofillCreditCardResult,
+        base::Bind(&AutofillWebDataService::DestroyAutofillCreditCardResult,
               base::Unretained(this))));
 }
 
 WebDatabase::State
-AutofillWebDataServiceImpl::RemoveAutofillProfilesAndCreditCardsModifiedBetweenImpl(
+AutofillWebDataService::RemoveAutofillProfilesAndCreditCardsModifiedBetweenImpl(
         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)->
       RemoveAutofillProfilesAndCreditCardsModifiedBetween(
           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(
+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 AutofillWebDataServiceImpl::DestroyAutofillCreditCardResult(
+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);
 }