Profile shouldn't own PersonalDataManager

chrome/browser/autofill/personal_data_manager.cc

 // Copyright (c) 2011 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/autofill/personal_data_manager.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill-inl.h"
 #include "chrome/browser/autofill/autofill_field.h"
 #include "chrome/browser/autofill/autofill_metrics.h"
 #include "chrome/browser/autofill/autofill_regexes.h"
 #include "chrome/browser/autofill/form_structure.h"
 #include "chrome/browser/autofill/personal_data_manager_observer.h"
 #include "chrome/browser/autofill/phone_number.h"
 #include "chrome/browser/autofill/phone_number_i18n.h"
 #include "chrome/browser/autofill/select_control_handler.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/webdata/web_data_service.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/browser_thread.h"
+#include "content/common/notification_source.h"
 
 namespace {
 
 template<typename T>
 class FormGroupMatchesByGUIDFunctor {
  public:
   explicit FormGroupMatchesByGUIDFunctor(const std::string& guid)
       : guid_(guid) {
   }
 
@@ skipping 153 matching lines @@
   ProfileSyncService* sync_service = profile_->GetProfileSyncService();
   if (!sync_service)
     return;
 
   if (sync_service->ShouldPushChanges()) {
     web_data_service->EmptyMigrationTrash(true);
     sync_service->RemoveObserver(this);
   }
 }
 
+void PersonalDataManager::Shutdown() {
+  CancelPendingQuery(&pending_profiles_query_);
+  CancelPendingQuery(&pending_creditcards_query_);
+  notification_registrar_.RemoveAll();
+}
+
+void PersonalDataManager::Observe(int type,
+                                  const NotificationSource& source,
+                                  const NotificationDetails& details) {
+  DCHECK_EQ(type, chrome::NOTIFICATION_AUTOFILL_MULTIPLE_CHANGED);
+  WebDataService* web_data_service = Source<WebDataService>(source).ptr();
+
+  DCHECK(web_data_service &&
+         web_data_service ==
+             profile_->GetWebDataService(Profile::EXPLICIT_ACCESS));
+  Refresh();

[Ilya Sherman, 2011/09/23 03:56:34]

Why does sync need to inform the PDM to refresh, beyond notifications already
sent by the WDS?

[dhollowa, 2011/09/23 16:30:03]

The WDS notifications are not seen by the UI thread (except for
NOTIFICATION_WEB_DATABASE_LOADED).  The Sync code manipulates the WebDatabase
directly (not via WDS) in some cases, so needs to inform the PDM that changes
have been made.

This notification replaces an existing (tightly coupled) mechanism where Sync
was calling Refresh() directly.  I've changed it to this so that Sync does not
need to affect the lifetime of the PDM.  It just sends a notification and either
the PDM is alive and responsive, or it is not.

+}
+
 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;
   std::vector<const FormStructure*>::const_iterator iter;
@@ skipping 313 matching lines @@
       pending_profiles_query_(0),
       pending_creditcards_query_(0),
       metric_logger_(new AutofillMetrics),
       has_logged_profile_count_(false) {
 }
 
 void PersonalDataManager::Init(Profile* profile) {
   profile_ = profile;
   metric_logger_->LogIsAutofillEnabledAtStartup(IsAutofillEnabled());
 
+  // WebDataService may not be available in tests.
+  WebDataService* web_data_service =
+    profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
+  if (!web_data_service)
+    return;
+
   LoadProfiles();
   LoadCreditCards();
+
+  notification_registrar_.Add(this,
+                              chrome::NOTIFICATION_AUTOFILL_MULTIPLE_CHANGED,
+                              Source<WebDataService>(web_data_service));
 }
 
 bool PersonalDataManager::IsAutofillEnabled() const {
   return profile_->GetPrefs()->GetBoolean(prefs::kAutofillEnabled);
 }
 
 // static
 bool PersonalDataManager::IsValidLearnableProfile(
     const AutofillProfile& profile) {
   if (!IsMinimumAddress(profile))
@@ skipping 360 matching lines @@
 }
 
 const AutofillMetrics* PersonalDataManager::metric_logger() const {
   return metric_logger_.get();
 }
 
 void PersonalDataManager::set_metric_logger(
     const AutofillMetrics* metric_logger) {
   metric_logger_.reset(metric_logger);
 }