Re-submitting the cl r72292, while removing incorrect DCHECK()...

chrome/browser/autofill/form_structure.h

 // Copyright (c) 2009 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_FORM_STRUCTURE_H_
 #define CHROME_BROWSER_AUTOFILL_FORM_STRUCTURE_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 23 matching lines @@
 class AutoFillMetrics;
 
 // FormStructure stores a single HTML form together with the values entered
 // in the fields along with additional information needed by AutoFill.
 class FormStructure {
  public:
   explicit FormStructure(const webkit_glue::FormData& form);
   virtual ~FormStructure();
 
   // Encodes the XML upload request from this FormStructure.
-  bool EncodeUploadRequest(bool auto_fill_used,
-                           std::string* encoded_xml) const;
+  bool EncodeUploadRequest(bool auto_fill_used, std::string* encoded_xml) const;
 
   // Encodes the XML query request for the set of forms.
   // All fields are returned in one XML. For example, there are three forms,
   // with 2, 4, and 3 fields. The returned XML would have type info for 9
   // fields, first two of which would be for the first form, next 4 for the
   // second, and the rest is for the third.
   static bool EncodeQueryRequest(const ScopedVector<FormStructure>& forms,
                                  std::vector<std::string>* encoded_signatures,
                                  std::string* encoded_xml);
 
@@ skipping 65 matching lines @@
   void GetHeuristicAutoFillTypes();
 
   // Associates the field with the heuristic type for each of the field views.
   void GetHeuristicFieldInfo(FieldTypeMap* field_types_map);
 
   // Adds form info to |encompassing_xml_element|. |request_type| indicates if
   // it is a query or upload.
   bool EncodeFormRequest(EncodeRequestType request_type,
                          buzz::XmlElement* encompassing_xml_element) const;
 
+  // Helper for EncodeUploadRequest() that collects presense of all data in the
+  // form structure and converts it to string for uploading.
+  std::string ConvertPresenceBitsToString() const;
+
   // The name of the form.
   string16 form_name_;
 
   // The source URL.
   GURL source_url_;
 
   // The target URL.
   GURL target_url_;
 
   bool has_credit_card_field_;
@@ skipping 12 matching lines @@
   // character. E.g.: "&form_input1_name&form_input2_name&...&form_inputN_name"
   std::string form_signature_field_names_;
 
   // GET or POST.
   RequestMethod method_;
 
   DISALLOW_COPY_AND_ASSIGN(FormStructure);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_FORM_STRUCTURE_H_