Refactor notifications of chrome/browser/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/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/ui/profile_error_dialog.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_data_service_observer.h"
 #include "chrome/browser/webdata/web_database_service.h"
 #include "chrome/browser/webdata/web_intents_table.h"
 #include "chrome/common/chrome_constants.h"
-#include "chrome/common/chrome_notification_types.h"
 #include "components/autofill/browser/autofill_country.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/credit_card.h"
 #include "components/autofill/common/form_field_data.h"
 #ifdef DEBUG
 #include "content/public/browser/browser_thread.h"
 #endif
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/browser/notification_source.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // WebDataService implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 using base::Bind;
 using base::Time;
 using content::BrowserThread;
 
-namespace {
-
-// A task used by WebDataService (for Sync mainly) to inform the
-// PersonalDataManager living on the UI thread that it needs to refresh.
-void NotifyOfMultipleAutofillChangesTask(
-    const scoped_refptr<WebDataService>& web_data_service) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  content::NotificationService::current()->Notify(
-      chrome::NOTIFICATION_AUTOFILL_MULTIPLE_CHANGED,
-      content::Source<WebDataServiceBase>(web_data_service.get()),
-      content::NotificationService::NoDetails());
-}
-
-}  // namespace
-
 WDAppImagesResult::WDAppImagesResult() : has_all_images(false) {}
 
 WDAppImagesResult::~WDAppImagesResult() {}
 
 WDKeywordsResult::WDKeywordsResult()
   : default_search_provider_id(0),
     builtin_keyword_version(0) {
 }
 
 WDKeywordsResult::~WDKeywordsResult() {}
@@ skipping 12 matching lines @@
 // 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,
+      Bind(&WebDataService::NotifyAutofillMultipleChangedOnUIThread,
            make_scoped_refptr(web_data_service)));
 }
 
 void WebDataService::ShutdownOnUIThread() {
   db_loaded_ = false;
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
       Bind(&WebDataService::ShutdownSyncableServices, this));
 }
 
 void WebDataService::Init() {
   wdbs_->LoadDatabase(
       Bind(&WebDataService::OnDatabaseInit, base::Unretained(this)));
 
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
       Bind(&WebDataService::InitializeSyncableServices, this));
 }
 
 void WebDataService::CancelRequest(Handle h) {
   wdbs_->CancelRequest(h);
 }
 
-content::NotificationSource WebDataService::GetNotificationSource() {
-  return content::Source<WebDataService>(this);
-}
-
 bool WebDataService::IsDatabaseLoaded() {
   return db_loaded_;
 }
 
 WebDatabase* WebDataService::GetDatabase() {
   return wdbs_->GetDatabase();
 }
 
 //////////////////////////////////////////////////////////////////////////////
 //
@@ skipping 180 matching lines @@
   DCHECK(autocomplete_syncable_service_ == NULL);
   DCHECK(autofill_profile_syncable_service_ == NULL);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // The following methods are executed on the DB thread.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
+void WebDataService::NotifyDatabaseLoadedOnUIThread() {
+  db_loaded_ = true;
+  // Notify that the database has been initialized.
+  FOR_EACH_OBSERVER(WebDataServiceObserver,
+                    observer_list_,
+                    WebDatabaseLoaded());
+}
+
 void WebDataService::DBInitFailed(sql::InitStatus sql_status) {
   ShowProfileErrorDialog(
       (sql_status == sql::INIT_FAILURE) ?
       IDS_COULDNT_OPEN_PROFILE_ERROR : IDS_PROFILE_TOO_NEW_ERROR);
 }
 
-void WebDataService::NotifyDatabaseLoadedOnUIThread() {
-  db_loaded_ = true;
-  // Notify that the database has been initialized.
-  content::NotificationService::current()->Notify(
-      chrome::NOTIFICATION_WEB_DATABASE_LOADED,
-      content::Source<WebDataService>(this),
-      content::NotificationService::NoDetails());
-}
-
 void WebDataService::OnDatabaseInit(sql::InitStatus status) {
   if (status == sql::INIT_OK) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&WebDataService::NotifyDatabaseLoadedOnUIThread, this));
   } else {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&WebDataService::DBInitFailed, this, status));
   }
@@ skipping 147 matching lines @@
     const std::vector<FormFieldData>& fields, WebDatabase* db) {
   AutofillChangeList changes;
   if (!db->GetAutofillTable()->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<WebDataService>(this),
-      content::Details<AutofillChangeList>(&changes));
+  FOR_EACH_OBSERVER(WebDataServiceObserver,
+                    observer_list_,
+                    AutofillEntriesChanged(changes));
 
   return WebDatabase::COMMIT_NEEDED;
 }
 
 scoped_ptr<WDTypedResult> WebDataService::GetFormValuesForElementNameImpl(
     const string16& name, const string16& prefix, int limit, WebDatabase* db) {
   std::vector<string16> values;
   db->GetAutofillTable()->GetFormValuesForElementName(
       name, prefix, &values, limit);
   return scoped_ptr<WDTypedResult>(
       new WDResult<std::vector<string16> >(AUTOFILL_VALUE_RESULT, values));
 }
 
 WebDatabase::State WebDataService::RemoveFormElementsAddedBetweenImpl(
     const base::Time& delete_begin, const base::Time& delete_end,
     WebDatabase* db) {
   AutofillChangeList changes;
 
   if (db->GetAutofillTable()->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<WebDataService>(this),
-          content::Details<AutofillChangeList>(&changes));
+      FOR_EACH_OBSERVER(WebDataServiceObserver,
+                        observer_list_,
+                        AutofillEntriesChanged(changes));
     }
     return WebDatabase::COMMIT_NEEDED;
   }
   return WebDatabase::COMMIT_NOT_NEEDED;
 }
 
 WebDatabase::State WebDataService::RemoveExpiredFormElementsImpl(
     WebDatabase* db) {
   AutofillChangeList changes;
 
   if (db->GetAutofillTable()->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<WebDataService>(this),
-          content::Details<AutofillChangeList>(&changes));
+      FOR_EACH_OBSERVER(WebDataServiceObserver,
+                        observer_list_,
+                        AutofillEntriesChanged(changes));
     }
     return WebDatabase::COMMIT_NEEDED;
   }
   return WebDatabase::COMMIT_NOT_NEEDED;
 }
 
 WebDatabase::State WebDataService::RemoveFormValueForElementNameImpl(
     const string16& name, const string16& value, WebDatabase* db) {
 
   if (db->GetAutofillTable()->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<WebDataService>(this),
-        content::Details<AutofillChangeList>(&changes));
+    FOR_EACH_OBSERVER(WebDataServiceObserver,
+                      observer_list_,
+                      AutofillEntriesChanged(changes));
 
     return WebDatabase::COMMIT_NEEDED;
   }
   return WebDatabase::COMMIT_NOT_NEEDED;
 }
 
 WebDatabase::State WebDataService::AddAutofillProfileImpl(
     const AutofillProfile& profile, WebDatabase* db) {
   if (!db->GetAutofillTable()->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<WebDataService>(this),
-      content::Details<AutofillProfileChange>(&change));
+  AutofillProfileChange change(
+      AutofillProfileChange::ADD, profile.guid(), &profile);
+  FOR_EACH_OBSERVER(WebDataServiceObserver,
+                    observer_list_,
+                    AutofillProfileChanged(change));
 
   return WebDatabase::COMMIT_NEEDED;
 }
 
 WebDatabase::State WebDataService::UpdateAutofillProfileImpl(
     const AutofillProfile& profile, WebDatabase* 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 (!db->GetAutofillTable()->GetAutofillProfile(profile.guid(),
       &original_profile)) {
     return WebDatabase::COMMIT_NOT_NEEDED;
   }
   scoped_ptr<AutofillProfile> scoped_profile(original_profile);
 
   if (!db->GetAutofillTable()->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<WebDataService>(this),
-      content::Details<AutofillProfileChange>(&change));
+  FOR_EACH_OBSERVER(WebDataServiceObserver,
+                    observer_list_,
+                    AutofillProfileChanged(change));
 
   return WebDatabase::COMMIT_NEEDED;
 }
 
 WebDatabase::State WebDataService::RemoveAutofillProfileImpl(
     const std::string& guid, WebDatabase* db) {
   AutofillProfile* profile = NULL;
   if (!db->GetAutofillTable()->GetAutofillProfile(guid, &profile)) {
     NOTREACHED();
     return WebDatabase::COMMIT_NOT_NEEDED;
   }
   scoped_ptr<AutofillProfile> scoped_profile(profile);
 
   if (!db->GetAutofillTable()->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<WebDataService>(this),
-      content::Details<AutofillProfileChange>(&change));
+  FOR_EACH_OBSERVER(WebDataServiceObserver,
+                    observer_list_,
+                    AutofillProfileChanged(change));
 
   return WebDatabase::COMMIT_NEEDED;
 }
 
 scoped_ptr<WDTypedResult> WebDataService::GetAutofillProfilesImpl(
     WebDatabase* db) {
   std::vector<AutofillProfile*> profiles;
   db->GetAutofillTable()->GetAutofillProfiles(&profiles);
   return scoped_ptr<WDTypedResult>(
       new WDDestroyableResult<std::vector<AutofillProfile*> >(
@@ skipping 60 matching lines @@
   if (db->GetAutofillTable()->
       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<WebDataService>(this),
-          content::Details<AutofillProfileChange>(&change));
+      FOR_EACH_OBSERVER(WebDataServiceObserver,
+                        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 WebDataService::NotifyAutofillMultipleChangedOnUIThread() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  FOR_EACH_OBSERVER(WebDataServiceObserver,
+                    observer_list_,
+                    AutofillMultipleChanged());
+}
+
 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::AddObserver(WebDataServiceObserver* observer) {
+  observer_list_.AddObserver(observer);
+}
+
+void WebDataService::RemoveObserver(WebDataServiceObserver* observer) {
+  observer_list_.RemoveObserver(observer);
+}
+
 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);
 }
-