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

chrome/browser/autofill/autofill_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_AUTOFILL_MANAGER_H_
 #define CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_
 
 #include <vector>
 #include <string>
 
@@ skipping 15 matching lines @@
 struct FormData;
 class FormField;
 }  // namespace webkit_glue
 
 // TODO(jhawkins): Maybe this should be in a grd file?
 extern const char* kAutoFillLearnMoreUrl;
 
 // Manages saving and restoring the user's personal information entered into web
 // forms.
 class AutoFillManager : public RenderViewHostDelegate::AutoFill,
+                        public PersonalDataManager::Observer,
                         public AutoFillDownloadManager::Observer {
  public:
   explicit AutoFillManager(TabContents* tab_contents);
   virtual ~AutoFillManager();
 
   // Registers our browser prefs.
   static void RegisterBrowserPrefs(PrefService* prefs);
 
   // Registers our Enable/Disable AutoFill pref.
   static void RegisterUserPrefs(PrefService* prefs);
 
   // RenderViewHostDelegate::AutoFill implementation:
   virtual void FormSubmitted(const webkit_glue::FormData& form);
   virtual void FormsSeen(
       const std::vector<webkit_glue::FormData>& forms);
   virtual bool GetAutoFillSuggestions(int query_id,
                                       const webkit_glue::FormField& field);
   virtual bool FillAutoFillFormData(int query_id,
                                     const webkit_glue::FormData& form,
                                     const string16& value,
                                     const string16& label);
 
+  // PersonalDataManager::Observer implementation:
+  virtual void OnPersonalDataLoaded();
+
   // Called by the AutoFillInfoBarDelegate when the user closes the infobar.
   virtual void OnInfoBarClosed();
 
   // Called by the AutoFillInfoBarDelegate when the user accepts the infobar.
   virtual void OnInfoBarAccepted();
 
   // Called by the AutoFillInfoBarDelegate when the user cancels the infobar.
   virtual void OnInfoBarCancelled();
 
   // Resets the stored form data.
@@ skipping 69 matching lines @@
   // The form data the user has submitted.
   scoped_ptr<FormStructure> upload_form_structure_;
 
   // The InfoBar that asks for permission to store form information.
   scoped_ptr<AutoFillInfoBarDelegate> infobar_;
 
   DISALLOW_COPY_AND_ASSIGN(AutoFillManager);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_