Refactor notifications of chrome/browser/webdata

components/autofill/browser/personal_data_manager.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 "components/autofill/browser/personal_data_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <iterator>
 
@@ skipping 113 matching lines @@
   scoped_ptr<AutofillWebDataService> autofill_data(
       AutofillWebDataService::FromBrowserContext(browser_context_));
 
   // WebDataService may not be available in tests.
   if (!autofill_data.get())
     return;
 
   LoadProfiles();
   LoadCreditCards();
 
-  notification_registrar_.Add(
-      this,
-      chrome::NOTIFICATION_AUTOFILL_MULTIPLE_CHANGED,
-      autofill_data->GetNotificationSource());
+  autofill_data->AddObserver(this);

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

Please use ScopedObserver.

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

Can not do it here.. AutofillWebDataService is a wrapper on WebDataService, so I
can not get the true Source here

[dhollowa, 2013/03/13 16:15:28]

This should work:
  scoped_observer_.Add(autofill_data.get());

[kaiwang, 2013/03/13 17:27:40]

AutofillWebDataService is a thin wrapper. Every time a new instance will be
generated and the true notification source is underneath :(
There's a current refactoring on this. ScopedObserver should be able to work
later

[dhollowa, 2013/03/14 00:35:17]

Got it.  Ok.

 }
 
 PersonalDataManager::~PersonalDataManager() {
   CancelPendingQuery(&pending_profiles_query_);
   CancelPendingQuery(&pending_creditcards_query_);
+
+  scoped_ptr<AutofillWebDataService> autofill_data(
+      AutofillWebDataService::FromBrowserContext(browser_context_));
+  if (autofill_data.get())
+    autofill_data->RemoveObserver(this);
 }
 
 void PersonalDataManager::OnWebDataServiceRequestDone(
     WebDataServiceBase::Handle h,
     const WDTypedResult* result) {
   DCHECK(pending_profiles_query_ || pending_creditcards_query_);
 
   if (!result) {
     // Error from the web database.
     if (h == pending_creditcards_query_)
@@ skipping 22 matching lines @@
     is_data_loaded_ = true;
     std::vector<AutofillProfile*> profile_pointers(web_profiles_.size());
     std::copy(web_profiles_.begin(), web_profiles_.end(),
               profile_pointers.begin());
     AutofillProfile::AdjustInferredLabels(&profile_pointers);
     FOR_EACH_OBSERVER(PersonalDataManagerObserver, observers_,
                       OnPersonalDataChanged());
   }
 }
 
+void PersonalDataManager::AutofillMultipleChanged() {
+  Refresh();
+}
+
 void PersonalDataManager::AddObserver(PersonalDataManagerObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void PersonalDataManager::RemoveObserver(
     PersonalDataManagerObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-void PersonalDataManager::Observe(int type,
-                                  const content::NotificationSource& source,
-                                  const content::NotificationDetails& details) {
-  DCHECK_EQ(type, chrome::NOTIFICATION_AUTOFILL_MULTIPLE_CHANGED);
-
-  if (DCHECK_IS_ON()) {
-    scoped_ptr<AutofillWebDataService> autofill_data(
-        AutofillWebDataService::FromBrowserContext(browser_context_));
-
-    DCHECK(autofill_data.get() &&
-           autofill_data->GetNotificationSource() == source);
-  }
-
-  Refresh();
-}
-
 bool PersonalDataManager::ImportFormData(
     const FormStructure& form,
     const CreditCard** imported_credit_card) {
   scoped_ptr<AutofillProfile> imported_profile(new AutofillProfile);
   scoped_ptr<CreditCard> local_imported_credit_card(new CreditCard);
 
   // Parse the form and construct a profile based on the information that is
   // possible to import.
   int importable_credit_card_fields = 0;
 
@@ skipping 743 matching lines @@
 
 void PersonalDataManager::set_metric_logger(
     const AutofillMetrics* metric_logger) {
   metric_logger_.reset(metric_logger);
 }
 
 void PersonalDataManager::set_browser_context(
     content::BrowserContext* context) {
   browser_context_ = context;
 }