Use WebInputElement.isCheckbox() and isRadioButton() API being exposed by https://bugs.webkit.org/s…

chrome/renderer/autofill/form_autofill_util.cc

 // Copyright (c) 2012 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_autofill_util.h"
 
 #include <map>
 
 #include "base/logging.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 556 matching lines @@
   return element->isTextField() && !element->isPasswordField();
 }
 
 bool IsSelectElement(const WebFormControlElement& element) {
   // Is static for improving performance.
   CR_DEFINE_STATIC_LOCAL(WebString, kSelectOne, ("select-one"));
   return element.formControlType() == kSelectOne;
 }
 
 bool IsCheckableElement(const WebInputElement* element) {
-  // Is static for improving performance.
-  CR_DEFINE_STATIC_LOCAL(WebString, kRadio, ("radio"));
-  CR_DEFINE_STATIC_LOCAL(WebString, kCheckbox, ("checkbox"));
-
   if (!element)
     return false;
 
-  WebString formControlType = element->formControlType();
-  return formControlType == kCheckbox || formControlType == kRadio;
+  return element->isCheckbox() || element->isRadioButton();
 }
 
 bool IsAutofillableInputElement(const WebInputElement* element) {
-  // TODO(ramankk): Uncomment IsCheckableElement part once we have solution
-  // for the observed performance regression.
-  return IsTextInput(element); // || IsCheckableElement(element);
+  return IsTextInput(element) || IsCheckableElement(element);
 }
 
 const string16 GetFormIdentifier(const WebFormElement& form) {
   string16 identifier = form.name();
   if (identifier.empty())
     identifier = form.getAttribute(WebString("id"));
 
   return identifier;
 }
 
@@ skipping 385 matching lines @@
       continue;
 
     if (input_element->isAutofilled())
       return true;
   }
 
   return false;
 }
 
 }  // namespace autofill