Refactor notifications of chrome/browser/webdata

chrome/browser/webdata/autofill_profile_syncable_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/autofill_profile_syncable_service.h"
 
 #include "base/guid.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/webdata/autofill_table.h"
 #include "chrome/browser/webdata/autofill_web_data_service.h"
 #include "chrome/browser/webdata/web_database.h"
-#include "chrome/common/chrome_notification_types.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/form_group.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_source.h"
 #include "sync/api/sync_error.h"
 #include "sync/api/sync_error_factory.h"
 #include "sync/protocol/sync.pb.h"
 
 using content::BrowserThread;
 
 namespace {
 
 std::string LimitData(const std::string& data) {
   std::string sanitized_value(data);
   if (sanitized_value.length() > AutofillTable::kMaxDataLength)
     sanitized_value.resize(AutofillTable::kMaxDataLength);
   return sanitized_value;
 }
 
 void* UserDataKey() {
   // Use the address of a static that COMDAT folding won't ever fold
   // with something else.
   static int user_data_key = 0;
   return reinterpret_cast<void*>(&user_data_key);
 }
 
 }  // namespace
 
 const char kAutofillProfileTag[] = "google_chrome_autofill_profiles";
 
 AutofillProfileSyncableService::AutofillProfileSyncableService(
     AutofillWebDataService* web_data_service)
-    : web_data_service_(web_data_service) {
+    : web_data_service_(web_data_service),
+      ALLOW_THIS_IN_INITIALIZER_LIST(scoped_observer_(this)) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   DCHECK(web_data_service_);
-  notification_registrar_.Add(
-      this,
-      chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED,
-      content::Source<AutofillWebDataService>(web_data_service_));
+
+  scoped_observer_.Add(web_data_service_);
 }
 
 AutofillProfileSyncableService::~AutofillProfileSyncableService() {
   DCHECK(CalledOnValidThread());
 }
 
 // static
 void AutofillProfileSyncableService::CreateForWebDataService(
     AutofillWebDataService* web_data_service) {
   web_data_service->GetDBUserData()->SetUserData(
       UserDataKey(), new AutofillProfileSyncableService(web_data_service));
 }
 
 // static
 AutofillProfileSyncableService*
 AutofillProfileSyncableService::FromWebDataService(
     AutofillWebDataService* web_data_service) {
   return static_cast<AutofillProfileSyncableService*>(
       web_data_service->GetDBUserData()->GetUserData(UserDataKey()));
 }
 
 AutofillProfileSyncableService::AutofillProfileSyncableService()
-    : web_data_service_(NULL) {
+    : web_data_service_(NULL),
+      ALLOW_THIS_IN_INITIALIZER_LIST(scoped_observer_(this)) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
 }
 
 syncer::SyncMergeResult
 AutofillProfileSyncableService::MergeDataAndStartSyncing(
     syncer::ModelType type,
     const syncer::SyncDataList& initial_sync_data,
     scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
     scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) {
   DCHECK(CalledOnValidThread());
@@ skipping 164 matching lines @@
     return sync_error_factory_->CreateAndUploadError(
         FROM_HERE,
         "Failed to update webdata.");
   }
 
   AutofillWebDataService::NotifyOfMultipleAutofillChanges(web_data_service_);
 
   return syncer::SyncError();
 }
 
-void AutofillProfileSyncableService::Observe(int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  DCHECK_EQ(type, chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED);
-  DCHECK_EQ(web_data_service_,
-            content::Source<AutofillWebDataService>(source).ptr());
+void AutofillProfileSyncableService::AutofillProfileChanged(
+    const AutofillProfileChange& change) {
   // Check if sync is on. If we receive notification prior to the sync being set
   // up we are going to process all when MergeData..() is called. If we receive
   // notification after the sync exited, it will be sinced next time Chrome
   // starts.
-  if (!sync_processor_.get())
-    return;
-
-  AutofillProfileChange* change =
-      content::Details<AutofillProfileChange>(details).ptr();
-  ActOnChange(*change);
+  if (sync_processor_.get())
+    ActOnChange(change);
 }
 
 bool AutofillProfileSyncableService::LoadAutofillData(
     std::vector<AutofillProfile*>* profiles) {
   return GetAutofillTable()->GetAutofillProfiles(profiles);
 }
 
 bool AutofillProfileSyncableService::SaveChangesToWebData(
     const DataBundle& bundle) {
   DCHECK(CalledOnValidThread());
@@ skipping 279 matching lines @@
   return (merge_into->Compare(merge_from) != 0);
 }
 
 AutofillTable* AutofillProfileSyncableService::GetAutofillTable() const {
   return AutofillTable::FromWebDatabase(web_data_service_->GetDatabase());
 }
 
 AutofillProfileSyncableService::DataBundle::DataBundle() {}
 
 AutofillProfileSyncableService::DataBundle::~DataBundle() {}