Refactor notifications of chrome/browser/webdata

chrome/browser/webdata/autofill_profile_syncable_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_PROFILE_SYNCABLE_SERVICE_H_
 #define CHROME_BROWSER_WEBDATA_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_vector.h"
 #include "base/synchronization/lock.h"
 #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"
 #include "sync/api/syncable_service.h"
 #include "sync/protocol/autofill_specifics.pb.h"
 
 class AutofillProfile;
 class AutofillTable;
 class FormGroup;
 class ProfileSyncServiceAutofillTest;
 class WebDataService;
 
 extern const char kAutofillProfileTag[];
 
 // The sync implementation for AutofillProfiles.
 // 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();
 
   static syncer::ModelType model_type() { return syncer::AUTOFILL_PROFILE; }
 
   // syncer::SyncableService implementation.
   virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
       syncer::ModelType type,
       const syncer::SyncDataList& initial_sync_data,
       scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
       scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) OVERRIDE;
   virtual void StopSyncing(syncer::ModelType type) OVERRIDE;
   virtual syncer::SyncDataList GetAllSyncData(
       syncer::ModelType type) const OVERRIDE;
   virtual syncer::SyncError ProcessSyncChanges(
       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
   // associating models, and send to the WebDatabase for persistence.
   // We do this so we hold the write lock for only a small period.
   // When storing the web db we are out of the write lock.
   struct DataBundle;
 
   // Helper to query WebDatabase for the current autofill state.
   // Made virtual for ease of mocking in the unit-test.
@@ skipping 75 matching lines @@
   static bool MergeProfile(const AutofillProfile& merge_from,
                            AutofillProfile* merge_into);
 
   // For unit-tests.
   AutofillProfileSyncableService();
   void set_sync_processor(syncer::SyncChangeProcessor* sync_processor) {
     sync_processor_.reset(sync_processor);
   }
 
   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.
   ScopedVector<AutofillProfile> profiles_;
   GUIDToProfileMap profiles_map_;
 
   scoped_ptr<syncer::SyncChangeProcessor> sync_processor_;
 
   scoped_ptr<syncer::SyncErrorFactory> sync_error_factory_;
 
@@ skipping 10 matching lines @@
   std::vector<AutofillProfile*> profiles_to_add;
 
   // When we go through sync we find profiles that are similar but unmatched.
   // Merge such profiles.
   GUIDToProfileMap candidates_to_merge;
   // Profiles that have multi-valued fields that are not in sync.
   std::vector<AutofillProfile*> profiles_to_sync_back;
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_