AutoFill: Parse HTMLLabel elements for form control element labels.

chrome/renderer/form_manager.h

Index: chrome/renderer/form_manager.h
diff --git a/chrome/renderer/form_manager.h b/chrome/renderer/form_manager.h
index a410294cd6bd6b635ff1cb3ad4ed8533e753ad4c..3842450800b4bd1e046823ba5ea5609f245224aa 100644
--- a/chrome/renderer/form_manager.h
+++ b/chrome/renderer/form_manager.h
@@ -85,15 +85,10 @@ class FormManager {
   void Reset();
 
  private:
-  // A map of WebFormControlElements keyed by each element's name.
-  typedef std::map<string16, WebKit::WebFormControlElement>
-      FormControlElementMap;
-
-  // Stores the WebFormElement and the map of form control elements for each
-  // form.
+  // Stores the WebFormElement and the form control elements for a form.
   struct FormElement {
     WebKit::WebFormElement form_element;
-    FormControlElementMap control_elements;
+    std::vector<WebKit::WebFormControlElement> control_elements;
   };
 
   // A map of vectors of FormElements keyed by the WebFrame containing each