autofill: Refactor PersonalDataManager::Observer into its own header file.

chrome/browser/autofill/autofill_ie_toolbar_import_win.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/autofill_ie_toolbar_import_win.h"
 
 #include <stddef.h>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/win/registry.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/autofill/crypto/rc4_decryptor.h"
 #include "chrome/browser/autofill/field_types.h"
 #include "chrome/browser/autofill/form_group.h"
 #include "chrome/browser/autofill/personal_data_manager.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/sync/util/data_encryption.h"
 
 using base::win::RegKey;
 
 // Forward declaration. This function is not in unnamed namespace as it
 // is referenced in the unittest.
 bool ImportCurrentUserProfiles(std::vector<AutofillProfile>* profiles,
                                std::vector<CreditCard>* credit_cards);
@@ skipping 135 matching lines @@
   if (!fax.IsEmpty() &&
       fax.ParseNumber(std::string("US"), &constructed_number)) {
     profile->SetCanonicalizedInfo(PHONE_FAX_WHOLE_NUMBER, constructed_number);
   }
 
   return has_non_empty_fields;
 }
 
 // Imports profiles from the IE toolbar and stores them. Asynchronous
 // if PersonalDataManager has not been loaded yet. Deletes itself on completion.
-class AutofillImporter : public PersonalDataManager::Observer {
+class AutofillImporter : public PersonalDataManagerObserver {
  public:
   explicit AutofillImporter(PersonalDataManager* personal_data_manager)
     : personal_data_manager_(personal_data_manager) {
       personal_data_manager_->SetObserver(this);
   }
 
   bool ImportProfiles() {
     if (!ImportCurrentUserProfiles(&profiles_, &credit_cards_)) {
       delete this;
       return false;
     }
     if (personal_data_manager_->IsDataLoaded())
       OnPersonalDataChanged();
     return true;
   }
 
-  // PersonalDataManager::Observer methods:
-  virtual void OnPersonalDataChanged() {
+  // PersonalDataManagerObserver:
+  virtual void OnPersonalDataChanged() OVERRIDE {
     for (std::vector<AutofillProfile>::const_iterator iter = profiles_.begin();
          iter != profiles_.end(); ++iter) {
       personal_data_manager_->AddProfile(*iter);
     }
     for (std::vector<CreditCard>::const_iterator iter = credit_cards_.begin();
          iter != credit_cards_.end(); ++iter) {
       personal_data_manager_->AddCreditCard(*iter);
     }
     delete this;
   }
@@ skipping 68 matching lines @@
 
 bool ImportAutofillDataWin(PersonalDataManager* pdm) {
   // In incognito mode we do not have PDM - and we should not import anything.
   if (!pdm)
     return false;
   AutofillImporter *importer = new AutofillImporter(pdm);
   // importer will self delete.
   return importer->ImportProfiles();
 }