Makes the auto fill dialogs match the mocks.

chrome/browser/autofill/personal_data_manager.cc

 // Copyright (c) 2010 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"
@@ skipping 41 matching lines @@
     case AUTOFILL_CREDITCARDS_RESULT:
       ReceiveLoadedCreditCards(h, result);
       break;
     default:
       NOTREACHED();
   }
 
   // If both requests have responded, then all personal data is loaded.
   if (pending_profiles_query_ == 0 && pending_creditcards_query_ == 0) {
     is_data_loaded_ = true;
-    // Copy is needed as observer can unsubscribe itself when notified.
-    std::vector<PersonalDataManager::Observer*> temporary_copy;
-    temporary_copy.resize(observers_.size());
-    std::copy(observers_.begin(), observers_.end(), temporary_copy.begin());
-    for (std::vector<PersonalDataManager::Observer*>::iterator
-         iter = temporary_copy.begin();
-         iter != temporary_copy.end();
-         ++iter) {
-      (*iter)->OnPersonalDataLoaded();
-    }
+    FOR_EACH_OBSERVER(Observer, observers_, OnPersonalDataLoaded());
   }
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // PersonalDataManager,
 // views::ButtonListener implementations
 void PersonalDataManager::OnAutoFillDialogApply(
     std::vector<AutoFillProfile>* profiles,
     std::vector<CreditCard>* credit_cards) {
   // |profiles| may be NULL.
   // |credit_cards| may be NULL.
   if (profiles) {
     CancelPendingQuery(&pending_profiles_query_);
     SetProfiles(profiles);
   }
   if (credit_cards) {
     CancelPendingQuery(&pending_creditcards_query_);
     SetCreditCards(credit_cards);
   }
 }
 
 void PersonalDataManager::SetObserver(PersonalDataManager::Observer* observer) {
-  for (std::vector<PersonalDataManager::Observer*>::iterator
-       iter = observers_.begin();
-       iter != observers_.end();
-       ++iter) {
-    if (*iter == observer) {
-      // Already have this observer.
-      return;
-    }
-  }
-  observers_.push_back(observer);
+  // TODO: RemoveObserver is for compatability with old code, it should be
+  // nuked.
+  observers_.RemoveObserver(observer);
+  observers_.AddObserver(observer);
 }
 
 void PersonalDataManager::RemoveObserver(
     PersonalDataManager::Observer* observer) {
-  for (std::vector<PersonalDataManager::Observer*>::iterator
-       iter = observers_.begin();
-       iter != observers_.end();
-       ++iter) {
-    if (*iter == observer) {
-      observers_.erase(iter);
-      return;
-    }
-  }
+  observers_.RemoveObserver(observer);
 }
 
 bool PersonalDataManager::ImportFormData(
     const std::vector<FormStructure*>& form_structures,
     AutoFillManager* autofill_manager) {
   AutoLock lock(unique_ids_lock_);
   // Parse the form and construct a profile based on the information that is
   // possible to import.
   int importable_fields = 0;
   int importable_credit_card_fields = 0;
@@ skipping 164 matching lines @@
   }
 
   web_profiles_.reset();
   for (std::vector<AutoFillProfile>::iterator iter = profiles->begin();
        iter != profiles->end(); ++iter) {
     web_profiles_.push_back(new AutoFillProfile(*iter));
   }
 
   // Read our writes to ensure consistency with the database.
   Refresh();
+
+  FOR_EACH_OBSERVER(Observer, observers_, OnPersonalDataChanged());
 }
 
 void PersonalDataManager::SetCreditCards(
     std::vector<CreditCard>* credit_cards) {
   if (profile_->IsOffTheRecord())
     return;
 
   SetUniqueCreditCardLabels(credit_cards);
 
   WebDataService* wds = profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
@@ skipping 43 matching lines @@
       iter->set_unique_id(CreateNextUniqueID(&unique_creditcard_ids_));
       wds->AddCreditCard(*iter);
     }
   }
 
   credit_cards_.reset();
   for (std::vector<CreditCard>::iterator iter = credit_cards->begin();
        iter != credit_cards->end(); ++iter) {
     credit_cards_.push_back(new CreditCard(*iter));
   }
+
+  FOR_EACH_OBSERVER(Observer, observers_, OnPersonalDataChanged());
 }
 
 void PersonalDataManager::GetPossibleFieldTypes(const string16& text,
                                                 FieldTypeSet* possible_types) {
   string16 clean_info = StringToLowerASCII(CollapseWhitespace(text, false));
   if (clean_info.empty()) {
     possible_types->insert(EMPTY_TYPE);
     return;
   }
 
@@ skipping 271 matching lines @@
 
   if (!merged)
     profiles.push_back(*imported_profile_);
 
   SetProfiles(&profiles);
 }
 
 void PersonalDataManager::SaveImportedCreditCard() {
   // http://crbug.com/47428
 }