Refactor notifications of chrome/browser/webdata

chrome/browser/webdata/autofill_web_data_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_WEBDATA_AUTOFILL_WEB_DATA_SERVICE_H_
 #define CHROME_BROWSER_WEBDATA_AUTOFILL_WEB_DATA_SERVICE_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
+#include "base/observer_list.h"
 #include "chrome/browser/api/webdata/autofill_web_data.h"
 #include "chrome/browser/api/webdata/web_data_results.h"
 #include "chrome/browser/api/webdata/web_data_service_base.h"
 #include "chrome/browser/api/webdata/web_data_service_consumer.h"
 #include "chrome/browser/webdata/web_database.h"
+#include "components/autofill/common/form_field_data.h"
 
 class AutofillChange;
+class AutofillProfile;
+class AutofillWebDataServiceObserverOnDBThread;
+class AutofillWebDataServiceObserverOnUIThread;
+class CreditCard;
 class WebDatabaseService;
 
 namespace content {
 class BrowserContext;
 }
 
-typedef std::vector<AutofillChange> AutofillChangeList;
-
 // API for Autofill web data.
-class AutofillWebDataService
-    : public AutofillWebData,
-      public WebDataServiceBase {
+class AutofillWebDataService : public AutofillWebData,
+                               public WebDataServiceBase {
  public:
   AutofillWebDataService();
 
   AutofillWebDataService(scoped_refptr<WebDatabaseService> wdbs,
                          const ProfileErrorCallback& callback);
 
   // Retrieve an AutofillWebDataService for the given context.
   // Can return NULL in some contexts.
   static scoped_refptr<AutofillWebDataService> FromBrowserContext(
       content::BrowserContext* context);
 
   // Notifies listeners on the UI thread that multiple changes have been made to
   // to Autofill records of the database.
   // NOTE: This method is intended to be called from the DB thread.  It
   // it asynchronously notifies listeners on the UI thread.
   // |web_data_service| may be NULL for testing purposes.
   static void NotifyOfMultipleAutofillChanges(
       AutofillWebDataService* web_data_service);
 
-  // WebDataServiceBase overrides:
-  virtual content::NotificationSource GetNotificationSource() OVERRIDE;
-
   // AutofillWebData implementation.
   virtual void AddFormFields(
       const std::vector<FormFieldData>& fields) OVERRIDE;
   virtual WebDataServiceBase::Handle GetFormValuesForElementName(
       const string16& name,
       const string16& prefix,
       int limit,
       WebDataServiceConsumer* consumer) OVERRIDE;
   virtual void RemoveFormElementsAddedBetween(
       const base::Time& delete_begin, const base::Time& delete_end) OVERRIDE;
   virtual void RemoveExpiredFormElements() OVERRIDE;
   virtual void RemoveFormValueForElementName(const string16& name,
                                              const string16& value) OVERRIDE;
   virtual void AddAutofillProfile(const AutofillProfile& profile) OVERRIDE;
   virtual void UpdateAutofillProfile(const AutofillProfile& profile) OVERRIDE;
   virtual void RemoveAutofillProfile(const std::string& guid) OVERRIDE;
   virtual WebDataServiceBase::Handle GetAutofillProfiles(
       WebDataServiceConsumer* consumer) OVERRIDE;
   virtual void AddCreditCard(const CreditCard& credit_card) OVERRIDE;
   virtual void UpdateCreditCard(const CreditCard& credit_card) OVERRIDE;
   virtual void RemoveCreditCard(const std::string& guid) OVERRIDE;
   virtual WebDataServiceBase::Handle GetCreditCards(
       WebDataServiceConsumer* consumer) OVERRIDE;
   virtual void RemoveAutofillDataModifiedBetween(
       const base::Time& delete_begin, const base::Time& delete_end) OVERRIDE;
 
+  void AddObserver(AutofillWebDataServiceObserverOnDBThread* observer);
+  void RemoveObserver(AutofillWebDataServiceObserverOnDBThread* observer);
+
+  void AddObserver(AutofillWebDataServiceObserverOnUIThread* observer);
+  void RemoveObserver(AutofillWebDataServiceObserverOnUIThread* observer);
 
  protected:
   virtual ~AutofillWebDataService();
 
+  // WebDataServiceBase overrides:
+  virtual void NotifyDatabaseLoadedOnUIThread() OVERRIDE;
+
  private:
   WebDatabase::State AddFormElementsImpl(
       const std::vector<FormFieldData>& fields, WebDatabase* db);
   scoped_ptr<WDTypedResult> GetFormValuesForElementNameImpl(
       const string16& name, const string16& prefix, int limit, WebDatabase* db);
   WebDatabase::State RemoveFormElementsAddedBetweenImpl(
       const base::Time& delete_begin, const base::Time& delete_end,
       WebDatabase* db);
   WebDatabase::State RemoveExpiredFormElementsImpl(WebDatabase* db);
   WebDatabase::State RemoveFormValueForElementNameImpl(
@@ skipping 14 matching lines @@
   scoped_ptr<WDTypedResult> GetCreditCardsImpl(WebDatabase* db);
   WebDatabase::State RemoveAutofillDataModifiedBetweenImpl(
       const base::Time& delete_begin, const base::Time& delete_end,
       WebDatabase* db);
 
   // Callbacks to ensure that sensitive info is destroyed if request is
   // cancelled.
   void DestroyAutofillProfileResult(const WDTypedResult* result);
   void DestroyAutofillCreditCardResult(const WDTypedResult* result);
 
+  void NotifyAutofillMultipleChangedOnUIThread();
+
+  ObserverList<AutofillWebDataServiceObserverOnDBThread> db_observer_list_;
+  ObserverList<AutofillWebDataServiceObserverOnUIThread> ui_observer_list_;
+
   DISALLOW_COPY_AND_ASSIGN(AutofillWebDataService);
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_AUTOFILL_WEB_DATA_SERVICE_H_