Refactoring of upload, form saving, and UMA logging.

chrome/browser/autofill/autofill_manager.h

Index: chrome/browser/autofill/autofill_manager.h
diff --git a/chrome/browser/autofill/autofill_manager.h b/chrome/browser/autofill/autofill_manager.h
index 76ed0d7f388be11ed68215f9642d1acddba778f2..bbf219eac3f64250bcfa9cdb6fa9d34f780620fe 100644
--- a/chrome/browser/autofill/autofill_manager.h
+++ b/chrome/browser/autofill/autofill_manager.h
@@ -67,11 +67,11 @@ class AutoFillManager : public IPC::Channel::Listener,
   // Returns the value of the AutoFillEnabled pref.
   virtual bool IsAutoFillEnabled() const;
 
-  // Handles the form data submitted by the user.
-  void HandleSubmit();
+  // Imports the form data, submitted by the user, into |personal_data_|.
+  void ImportFormData(const FormStructure& submitted_form);
 
   // Uploads the form data to the AutoFill server.
-  void UploadFormData();
+  void UploadFormData(const FormStructure& submitted_form);
 
   // Reset cache.
   void Reset();
@@ -173,9 +173,11 @@ class AutoFillManager : public IPC::Channel::Listener,
   void ParseForms(const std::vector<webkit_glue::FormData>& forms);
 
   // Uses existing personal data to determine possible field types for the
-  // |upload_form_structure_|.
-  void DeterminePossibleFieldTypesForUpload(
-      const FormStructure* cached_upload_form_structure);
+  // |submitted_form|.
+  void DeterminePossibleFieldTypesForUpload(FormStructure* submitted_form);
+
+  void LogMetricsAboutSubmittedForm(const webkit_glue::FormData& form,
+                                    const FormStructure* submitted_form);
 
   // The TabContents hosting this AutoFillManager.
   // Weak reference.
@@ -204,9 +206,6 @@ class AutoFillManager : public IPC::Channel::Listener,
   // Our copy of the form data.
   ScopedVector<FormStructure> form_structures_;
 
-  // The form data the user has submitted.
-  scoped_ptr<FormStructure> upload_form_structure_;
-
   // The InfoBar that asks for permission to store credit card information.
   // Deletes itself when closed.
   AutoFillCCInfoBarDelegate* cc_infobar_;