Refactor notifications of chrome/browser/webdata

chrome/browser/webdata/autofill_profile_syncable_service.h

Index: chrome/browser/webdata/autofill_profile_syncable_service.h
diff --git a/chrome/browser/webdata/autofill_profile_syncable_service.h b/chrome/browser/webdata/autofill_profile_syncable_service.h
index c55cec53b6d8dd359f379f131e7416af33c5ef74..fc3e2ea7863fb8c68ede74885407d651ed525f92 100644
--- a/chrome/browser/webdata/autofill_profile_syncable_service.h
+++ b/chrome/browser/webdata/autofill_profile_syncable_service.h
@@ -14,10 +14,8 @@
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/webdata/autofill_change.h"
 #include "chrome/browser/webdata/autofill_entry.h"
+#include "chrome/browser/webdata/web_data_service_observer.h"
 #include "components/autofill/browser/autofill_type.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
-#include "content/public/browser/notification_types.h"
 #include "sync/api/sync_change.h"
 #include "sync/api/sync_data.h"
 #include "sync/api/sync_error.h"
@@ -36,10 +34,9 @@ extern const char kAutofillProfileTag[];
 // MergeDataAndStartSyncing() called first, it does cloud->local and
 // local->cloud syncs. Then for each cloud change we receive
 // ProcessSyncChanges() and for each local change Observe() is called.
-class AutofillProfileSyncableService
-    : public syncer::SyncableService,
-      public content::NotificationObserver,
-      public base::NonThreadSafe {
+class AutofillProfileSyncableService : public syncer::SyncableService,
+                                       public WebDataServiceObserver,
+                                       public base::NonThreadSafe {
  public:
   explicit AutofillProfileSyncableService(WebDataService* web_data_service);
   virtual ~AutofillProfileSyncableService();
@@ -59,10 +56,9 @@ class AutofillProfileSyncableService
       const tracked_objects::Location& from_here,
       const syncer::SyncChangeList& change_list) OVERRIDE;
 
-  // content::NotificationObserver implementation.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  // WebDataServiceObserver implementation.
+  virtual void AutofillProfileChanged(const AutofillProfileChange& change)

[dhollowa, 2013/03/12 22:22:28]

nit: wrap at arg, not at OVERRIDE.

[kaiwang, 2013/03/13 04:57:20]

Done.

+      OVERRIDE;
 
  protected:
   // A convenience wrapper of a bunch of state we pass around while
@@ -158,7 +154,6 @@ class AutofillProfileSyncableService
   }
 
   WebDataService* web_data_service_;  // WEAK
-  content::NotificationRegistrar notification_registrar_;
 
   // Cached Autofill profiles. *Warning* deleted profiles are still in the
   // vector - use the |profiles_map_| to iterate through actual profiles.