Refactoring of upload, form saving, and UMA logging.

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_
 #pragma once
 
 #include <list>
 #include <string>
@@ skipping 49 matching lines @@
   virtual void OnLoadedAutoFillHeuristics(const std::string& heuristic_xml);
   virtual void OnUploadedAutoFillHeuristics(const std::string& form_signature);
   virtual void OnHeuristicsRequestError(
       const std::string& form_signature,
       AutoFillDownloadManager::AutoFillRequestType request_type,
       int http_error);
 
   // 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();
 
  protected:
   // For tests.
   AutoFillManager();
   AutoFillManager(TabContents* tab_contents,
                   PersonalDataManager* personal_data);
 
@@ skipping 81 matching lines @@
 
   // Set |field| argument's value for phone number based on contents of the
   // |profile|.
   void FillPhoneNumberField(const AutoFillProfile* profile,
                             webkit_glue::FormField* field);
 
   // Parses the forms using heuristic matching and querying the AutoFill server.
   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.
   // May not be NULL.
   TabContents* tab_contents_;
 
   // The personal data manager, used to save and load personal data to/from the
   // web database.  This is overridden by the AutoFillManagerTest.
   // Weak reference.
   // May be NULL.  NULL indicates OTR.
   PersonalDataManager* personal_data_;
 
   std::list<std::string> autofilled_forms_signatures_;
   // Handles queries and uploads to AutoFill servers.
   AutoFillDownloadManager download_manager_;
 
   // Should be set to true in AutoFillManagerTest and other tests, false in
   // AutoFillDownloadManagerTest and in non-test environment. Is false by
   // default for the public constructor, and true by default for the test-only
   // constructors.
   bool disable_download_manager_requests_;
 
   // For logging UMA metrics. Overridden by metrics tests.
   scoped_ptr<const AutoFillMetrics> metric_logger_;
 
   // 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_;
 
   // GUID to ID mapping.  We keep two maps to convert back and forth.
   std::map<std::string, int> guid_id_map_;
   std::map<int, std::string> id_guid_map_;
 
   friend class AutoFillManagerTest;
   friend class FormStructureBrowserTest;
   FRIEND_TEST_ALL_PREFIXES(AutoFillManagerTest, FillCreditCardForm);
   FRIEND_TEST_ALL_PREFIXES(AutoFillManagerTest, FillAddressForm);
   FRIEND_TEST_ALL_PREFIXES(AutoFillManagerTest, FillAddressAndCreditCardForm);
   FRIEND_TEST_ALL_PREFIXES(AutoFillManagerTest, FillAutoFilledForm);
   FRIEND_TEST_ALL_PREFIXES(AutoFillManagerTest, FillPhoneNumber);
   FRIEND_TEST_ALL_PREFIXES(AutoFillManagerTest, FormChangesRemoveField);
   FRIEND_TEST_ALL_PREFIXES(AutoFillManagerTest, FormChangesAddField);
   FRIEND_TEST_ALL_PREFIXES(AutoFillMetricsTest, QualityMetrics);
   FRIEND_TEST_ALL_PREFIXES(AutoFillMetricsTest,
                            NoQualityMetricsForNonAutoFillableForms);
   FRIEND_TEST_ALL_PREFIXES(AutoFillMetricsTest, QualityMetricsForFailure);
 
   DISALLOW_COPY_AND_ASSIGN(AutoFillManager);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_