Add <b> and <br> tags checking in infering labels.

chrome/renderer/autofill/form_manager.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/renderer/autofill/form_manager.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_vector.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
@@ skipping 135 matching lines @@
   if (previous.isNull())
     return string16();
 
   if (previous.isTextNode()) {
     inferred_label = previous.nodeValue();
     TrimWhitespace(inferred_label, TRIM_ALL, &inferred_label);
   }
 
   // If we didn't find text, check for previous paragraph.
   // Eg. <p>Some Text</p><input ...>
-  // Note the lack of whitespace between <p> and <input> elements.
+  // Eg. <b>Some Text</b><input ...>
+  // Note the lack of whitespace between (<p> or <b>) and <input> elements.
   if (inferred_label.empty() && previous.isElementNode()) {
     WebElement element = previous.to<WebElement>();
-    if (element.hasTagName("p")) {
+    if (element.hasTagName("p") || element.hasTagName("b")) {
       inferred_label = FindChildText(element);
     }
   }
 
   // If we didn't find paragraph, check for previous paragraph to this.
   // Eg. <p>Some Text</p>   <input ...>
-  // Note the whitespace between <p> and <input> elements.
+  // Eg. <b>Some Text</b>   <input ...>
+  // Note the whitespace between (<p> or <b>) and <input> elements.
   if (inferred_label.empty()) {
     WebNode sibling = previous.previousSibling();
     if (!sibling.isNull() && sibling.isElementNode()) {
       WebElement element = sibling.to<WebElement>();
-      if (element.hasTagName("p")) {
+      if (element.hasTagName("p") || element.hasTagName("b")) {
         inferred_label = FindChildText(element);
       }
     }
   }
 
-  // Look for text node prior to <img> tag.
+  // Look for text node prior to <img> or <br> tag.
   // Eg. Some Text<img/><input ...>
+  // Eg. Some Text<br/><input ...>
   if (inferred_label.empty()) {
     while (inferred_label.empty() && !previous.isNull()) {
       if (previous.isTextNode()) {
         inferred_label = previous.nodeValue();
         TrimWhitespace(inferred_label, TRIM_ALL, &inferred_label);
       } else if (previous.isElementNode()) {
         WebElement element = previous.to<WebElement>();
-        if (!element.hasTagName("img"))
+        if (!element.hasTagName("img") && !element.hasTagName("br"))
           break;
       } else {
         break;
       }
       previous = previous.previousSibling();
     }
   }
 
   // Look for label node prior to <input> tag.
   // Eg. <label>Some Text</label><input ...>
@@ skipping 766 matching lines @@
       data->value.substr(0, input_element->maxLength()));
   input_element->setAutofilled(true);
   if (is_initiating_node) {
     // Select the part of the text that the user didn't type.
     input_element->setSelectionRange(input_element->value().length(),
                                      input_element->suggestedValue().length());
   }
 }
 
 }  // namespace autofill