Revert 46424 - AutoFill profile shouldn't be saved when cancelled during init...

chrome/browser/autofill/personal_data_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOFILL_PERSONAL_DATA_MANAGER_H_
 #define CHROME_BROWSER_AUTOFILL_PERSONAL_DATA_MANAGER_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 32 matching lines @@
 
   // WebDataServiceConsumer implementation:
   virtual void OnWebDataServiceRequestDone(WebDataService::Handle h,
                                            const WDTypedResult* result);
 
   // AutoFillDialogObserver implementation:
   virtual void OnAutoFillDialogApply(std::vector<AutoFillProfile>* profiles,
                                      std::vector<CreditCard>* credit_cards);
 
   // Sets the listener to be notified of PersonalDataManager events.
-  virtual void SetObserver(PersonalDataManager::Observer* observer);
+  void SetObserver(PersonalDataManager::Observer* observer);
 
   // Removes |observer| as the observer of this PersonalDataManager.
-  virtual void RemoveObserver(PersonalDataManager::Observer* observer);
+  void RemoveObserver(PersonalDataManager::Observer* observer);
 
   // If AutoFill is able to determine the field types of a significant number
   // of field types that contain information in the FormStructures and the user
   // has not previously been prompted, the user will be asked if he would like
   // to import the data. If the user selects yes, a profile will be created
   // with all of the information from recognized fields.
   bool ImportFormData(const std::vector<FormStructure*>& form_structures,
                       AutoFillManager* autofill_manager);
 
   // Saves |imported_profile_| and |imported_credit_card_| to the WebDB if they
   // exist.
   void SaveImportedFormData();
 
-  // Gets |imported_profile_| and |imported_credit_card_| and returns their
-  // values in |profile| and |credit_card| parameters respectively.  One or
-  // both may return NULL.  The objects returned are owned by the
-  // PersonalDataManager, so should be considered weak references by caller.
-  // TODO(dhollowa) Now that we aren't immediately saving the imported form
-  // data, we should store the profile and CC in the AFM instead of the PDM.
-  void GetImportedFormData(AutoFillProfile** profile, CreditCard** credit_card);
-
   // Sets |web_profiles_| to the contents of |profiles| and updates the web
   // database by adding, updating and removing profiles.  Sets the unique ID of
   // newly-added profiles.
   //
   // The relationship between this and Refresh is subtle.
   // A call to SetProfile could include out-of-date data that may conflict
   // if we didn't refresh-to-latest before an autofill window was opened for
   // editing. SetProfile is implemented to make a "best effort" to apply the
   // changes, but in extremely rare edge cases it is possible not all of the
   // updates in |profiles| make it to the DB.  This is why SetProfiles will
@@ skipping 15 matching lines @@
   bool HasPassword();
 
   // Returns whether the personal data has been loaded from the web database.
   virtual bool IsDataLoaded() const { return is_data_loaded_; }
 
   // This PersonalDataManager owns these profiles and credit cards.  Their
   // lifetime is until the web database is updated with new profile and credit
   // card information, respectively.  |profiles()| returns both web and
   // auxiliary profiles.  |web_profiles()| returns only web profiles.
   const std::vector<AutoFillProfile*>& profiles();
-  virtual const std::vector<AutoFillProfile*>& web_profiles();
-  virtual const std::vector<CreditCard*>& credit_cards() {
-    return credit_cards_.get();
-  }
+  const std::vector<AutoFillProfile*>& web_profiles();
+  const std::vector<CreditCard*>& credit_cards() { return credit_cards_.get(); }
 
   // Returns the index of the default profile within the vector returned by
   // |web_profiles()|, or -1 if there are no profiles.
   int DefaultProfile() const;
 
   // Returns the index of the default credit card within the vector returned by
   // |credit_cards()|, or -1 if there are no credit cards.
   int DefaultCreditCard() const;
 
   // Creates a profile labeled |label|, with it's own locally unique ID.
@@ skipping 124 matching lines @@
   WebDataService::Handle pending_profiles_query_;
   WebDataService::Handle pending_creditcards_query_;
 
   // The observers.  This can be empty.
   std::vector<PersonalDataManager::Observer*> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PersonalDataManager);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_PERSONAL_DATA_MANAGER_H_