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

chrome/browser/autofill/autofill_dialog.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_DIALOG_H_
 #define CHROME_BROWSER_AUTOFILL_AUTOFILL_DIALOG_H_
 
 #include <vector>
 
 #include "chrome/browser/autofill/autofill_profile.h"
@@ skipping 15 matching lines @@
  protected:
   virtual ~AutoFillDialogObserver() {}
 };
 
 // Shows the AutoFill dialog, which allows the user to edit profile information.
 // |profile| is profile from which you can get vectors of of autofill profiles
 // that contains the current profile information and credit cards.
 // The dialog fills out the profile fields using this data. |observer| will be
 // notified by OnAutoFillDialogAccept when the user has applied changes.
 //
-// The |parent| parameter (currently only used on Windows) specifies the parent
-// view in the view hierarchy.  May be NULL on Mac and gtk.
-//
-// Optional parameters |imported_profile| and |imported_credit_card| may be
-// supplied.  If they are supplied (non-NULL) they will be used instead of
-// the profile and credit card data retrieved from the PersonalDataManager
-// associated with the |profile|.
-//
 // The PersonalDataManager owns the contents of these vectors.  The lifetime of
 // the contents is until the PersonalDataManager replaces them with new data
 // whenever the web database is updated.
-void ShowAutoFillDialog(gfx::NativeView parent,
+#if defined(OS_MACOSX)
+// TODO(dhollowa): update .mm files and remove this.
+void ShowAutoFillDialog(AutoFillDialogObserver* observer,
+                        const std::vector<AutoFillProfile*>& profiles,
+                        const std::vector<CreditCard*>& credit_cards,
+                        Profile* profile);
+#else
+void ShowAutoFillDialog(gfx::NativeWindow parent,
                         AutoFillDialogObserver* observer,
-                        Profile* profile,
-                        AutoFillProfile* imported_profile,
-                        CreditCard* imported_credit_card);
+                        Profile* profile);
+#endif
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_DIALOG_H_