Refactor notifications of chrome/browser/webdata

components/autofill/browser/personal_data_manager.h

Index: components/autofill/browser/personal_data_manager.h
diff --git a/components/autofill/browser/personal_data_manager.h b/components/autofill/browser/personal_data_manager.h
index 4a1292ac3da7974ac4c99d5f0162b2ec250710a7..d9fb1a8581de7e7c4010fc27af2244e0830dae1d 100644
--- a/components/autofill/browser/personal_data_manager.h
+++ b/components/autofill/browser/personal_data_manager.h
@@ -14,11 +14,10 @@
 #include "base/observer_list.h"
 #include "base/string16.h"
 #include "chrome/browser/api/webdata/web_data_service_consumer.h"
+#include "chrome/browser/webdata/web_data_service_observer.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/credit_card.h"
 #include "components/autofill/browser/field_types.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 
 class AutofillMetrics;
 class FormStructure;
@@ -37,7 +36,7 @@ class BrowserContext;
 // This class also stores the profiles loaded from the database for use during
 // Autofill.
 class PersonalDataManager : public WebDataServiceConsumer,
-                            public content::NotificationObserver {
+                            public WebDataServiceObserver {
  public:
   // A pair of GUID and variant index. Represents a single FormGroup and a
   // specific data variant.
@@ -54,19 +53,15 @@ class PersonalDataManager : public WebDataServiceConsumer,
       WebDataServiceBase::Handle h,
       const WDTypedResult* result) OVERRIDE;
 
+  // WebDataServiceObserver:
+  virtual void AutofillMultipleChanged() OVERRIDE;
+
   // Adds a listener to be notified of PersonalDataManager events.
   virtual void AddObserver(PersonalDataManagerObserver* observer);
 
   // Removes |observer| as an observer of this PersonalDataManager.
   virtual void RemoveObserver(PersonalDataManagerObserver* observer);
 
-  // content::NotificationObserver:
-  // Observes "batch" changes made by Sync and refreshes data from the
-  // WebDataServiceBase in response.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
-
   // Scans the given |form| for importable Autofill data. If the form includes
   // sufficient address data, it is immediately imported. If the form includes
   // sufficient credit card data, it is stored into |credit_card|, so that we
@@ -273,9 +268,6 @@ class PersonalDataManager : public WebDataServiceConsumer,
   // Whether we have already logged the number of profiles this session.
   mutable bool has_logged_profile_count_;
 
-  // Manages registration lifetime for NotificationObserver implementation.
-  content::NotificationRegistrar notification_registrar_;
-
   DISALLOW_COPY_AND_ASSIGN(PersonalDataManager);
 };