Profile shouldn't own PersonalDataManager

chrome/browser/sync/glue/autofill_change_processor.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/sync/glue/autofill_change_processor.h"
 
 #include <string>
 #include <vector>
 
 #include "base/location.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/glue/autofill_model_associator.h"
-#include "chrome/browser/sync/glue/do_optimistic_refresh_task.h"
 #include "chrome/browser/sync/internal_api/change_record.h"
 #include "chrome/browser/sync/internal_api/read_node.h"
 #include "chrome/browser/sync/internal_api/write_node.h"
 #include "chrome/browser/sync/internal_api/write_transaction.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/webdata/autofill_change.h"
 #include "chrome/browser/webdata/autofill_table.h"
 #include "chrome/browser/webdata/web_database.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/guid.h"
 #include "content/common/notification_service.h"
 
 namespace browser_sync {
 
 struct AutofillChangeProcessor::AutofillChangeRecord {
   sync_api::ChangeRecord::Action action_;
   int64 id_;
   sync_pb::AutofillSpecifics autofill_;
   AutofillChangeRecord(sync_api::ChangeRecord::Action action,
                        int64 id, const sync_pb::AutofillSpecifics& autofill)
       : action_(action),
         id_(id),
         autofill_(autofill) { }
 };
 
 AutofillChangeProcessor::AutofillChangeProcessor(
     AutofillModelAssociator* model_associator,
     WebDatabase* web_database,
-    PersonalDataManager* personal_data,
+    Profile* profile,
     UnrecoverableErrorHandler* error_handler)
     : ChangeProcessor(error_handler),
       model_associator_(model_associator),
       web_database_(web_database),
-      personal_data_(personal_data),
+      profile_(profile),
       observing_(false) {
   DCHECK(model_associator);
   DCHECK(web_database);
+  DCHECK(profile);
   DCHECK(error_handler);
-  DCHECK(personal_data);
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   StartObserving();
 }
 
 AutofillChangeProcessor::~AutofillChangeProcessor() {}
 
 void AutofillChangeProcessor::Observe(int type,
                                       const NotificationSource& source,
                                       const NotificationDetails& details) {
   // Ensure this notification came from our web database.
@@ skipping 14 matching lines @@
         "We might be running against an out-of-date server.");
     return;
   }
 
   DCHECK(type == chrome::NOTIFICATION_AUTOFILL_ENTRIES_CHANGED);
 
   AutofillChangeList* changes = Details<AutofillChangeList>(details).ptr();
   ObserveAutofillEntriesChanged(changes, &trans, autofill_root);
 }
 
-void AutofillChangeProcessor::PostOptimisticRefreshTask() {
-  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-      new DoOptimisticRefreshForAutofill(
-           personal_data_));
-}
-
 void AutofillChangeProcessor::ObserveAutofillEntriesChanged(
     AutofillChangeList* changes, sync_api::WriteTransaction* trans,
     const sync_api::ReadNode& autofill_root) {
   for (AutofillChangeList::iterator change = changes->begin();
        change != changes->end(); ++change) {
     switch (change->type()) {
       case AutofillChange::ADD:
         {
           sync_api::WriteNode sync_node(trans);
           std::string tag =
@@ skipping 188 matching lines @@
   }
   autofill_changes_.clear();
 
   // Make changes
   if (!web_database_->GetAutofillTable()->UpdateAutofillEntries(new_entries)) {
     error_handler()->OnUnrecoverableError(FROM_HERE,
                                           "Could not update autofill entries.");
     return;
   }
 
-  PostOptimisticRefreshTask();
+  WebDataService::NotifyOfMultipleAutofillChanges(profile_);
 
   StartObserving();
 }
 
 void AutofillChangeProcessor::ApplySyncAutofillEntryDelete(
       const sync_pb::AutofillSpecifics& autofill) {
   if (!web_database_->GetAutofillTable()->RemoveFormElement(
       UTF8ToUTF16(autofill.name()), UTF8ToUTF16(autofill.value()))) {
     error_handler()->OnUnrecoverableError(FROM_HERE,
         "Could not remove autofill node.");
@@ skipping 127 matching lines @@
   autofill.set_value(UTF16ToUTF8(entry.key().value()));
   const std::vector<base::Time>& ts(entry.timestamps());
   for (std::vector<base::Time>::const_iterator timestamp = ts.begin();
        timestamp != ts.end(); ++timestamp) {
     autofill.add_usage_timestamp(timestamp->ToInternalValue());
   }
   node->SetAutofillSpecifics(autofill);
 }
 
 }  // namespace browser_sync