Autofill: Modify various utility function to deal with unowned form fields.

components/autofill/content/renderer/form_autofill_util.h

 // Copyright 2013 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 COMPONENTS_AUTOFILL_CONTENT_RENDERER_FORM_AUTOFILL_UTIL_H_
 #define COMPONENTS_AUTOFILL_CONTENT_RENDERER_FORM_AUTOFILL_UTIL_H_
 
 #include <vector>
 
 #include "base/strings/string16.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
+#include "third_party/WebKit/public/web/WebElementCollection.h"
 #include "ui/gfx/rect.h"
 
 class GURL;
 
 namespace blink {
 class WebDocument;
 class WebElement;
 class WebFormElement;
 class WebFormControlElement;
 class WebFrame;
@@ skipping 85 matching lines @@
 // won't meet the |requirements|.  Also returns false if there are no fields or
 // too many fields in the |form|.
 bool WebFormElementToFormData(
     const blink::WebFormElement& form_element,
     const blink::WebFormControlElement& form_control_element,
     RequirementsMask requirements,
     ExtractMask extract_mask,
     FormData* form,
     FormFieldData* field);
 
+// Get all form control elements from |elements| that are not part of a form.
+// If |fieldsets| is not NULL, also append the fieldsets encountered that are
+// not part of a form.
+std::vector<blink::WebFormControlElement>
+GetUnownedAutofillableFormFieldElements(
+    const blink::WebElementCollection& elements,
+    std::vector<blink::WebElement>* fieldsets);
+
 // Fills |form| with the form data derived from |fieldsets|, |control_elements|
-// and |origin|. |extract_mask| usage and the return value are the same as
+// and |origin|. If |field| is non-NULL, fill it with the FormField
+// representation for |element|.
+// |extract_mask| usage and the return value are the same as
 // WebFormElementToFormData() above.
 bool UnownedFormElementsAndFieldSetsToFormData(
     const std::vector<blink::WebElement>& fieldsets,
     const std::vector<blink::WebFormControlElement>& control_elements,
+    const blink::WebFormControlElement* element,
     const GURL& origin,
+    RequirementsMask requirements,
     ExtractMask extract_mask,
-    FormData* form);
+    FormData* form,
+    FormFieldData* field);
 
-// Finds the form that contains |element| and returns it in |form|.  Fills
-// |field| with the |FormField| representation for element.
+// Finds the form that contains |element| and returns it in |form|.  If |field|
+// is non-NULL, fill it with the FormField representation for |element|.
 // Returns false if the form is not found or cannot be serialized.
 bool FindFormAndFieldForFormControlElement(
     const blink::WebFormControlElement& element,
     FormData* form,
     FormFieldData* field,
     RequirementsMask requirements);
 
 // Fills the form represented by |form|.  |element| is the input element that
 // initiated the auto-fill process.
 void FillForm(const FormData& form,
@@ skipping 32 matching lines @@
 // are of the type <script>, <meta>, or <title>.
 bool IsWebElementEmpty(const blink::WebElement& element);
 
 // Return a gfx::RectF that is the bounding box for |element| scaled by |scale|.
 gfx::RectF GetScaledBoundingBox(float scale,
                                 blink::WebFormControlElement* element);
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CONTENT_RENDERER_FORM_AUTOFILL_UTIL_H_