Remove a part of type checking predicates of HTMLInputElement.

Source/web/WebSearchableFormData.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "public/web/WebSearchableFormData.h"
 
 #include "core/HTMLNames.h"
+#include "core/InputTypeNames.h"
 #include "core/dom/Document.h"
 #include "core/html/FormDataList.h"
 #include "core/html/HTMLFormControlElement.h"
 #include "core/html/HTMLFormElement.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/HTMLOptionElement.h"
 #include "core/html/HTMLSelectElement.h"
 #include "platform/network/FormDataBuilder.h"
 #include "public/web/WebFormElement.h"
 #include "public/web/WebInputElement.h"
@@ skipping 87 matching lines @@
 
 // Returns true if the form element is in its default state, false otherwise.
 // The default state is the state of the form element on initial load of the
 // page, and varies depending upon the form element. For example, a checkbox is
 // in its default state if the checked state matches the state of the checked attribute.
 bool IsInDefaultState(HTMLFormControlElement* formElement)
 {
     ASSERT(formElement);
     if (isHTMLInputElement(*formElement)) {
         const HTMLInputElement& inputElement = toHTMLInputElement(*formElement);
-        if (inputElement.isCheckbox() || inputElement.isRadioButton())
+        if (inputElement.type() == InputTypeNames::checkbox || inputElement.type() == InputTypeNames::radio)
             return inputElement.checked() == inputElement.hasAttribute(checkedAttr);
     } else if (isHTMLSelectElement(*formElement)) {
         return IsSelectInDefaultState(toHTMLSelectElement(formElement));
     }
     return true;
 }
 
 // Look for a suitable search text field in a given HTMLFormElement
 // Return nothing if one of those items are found:
 //  - A text area field
@@ skipping 13 matching lines @@
         if (control->isDisabledFormControl() || control->name().isNull())
             continue;
 
         if (!IsInDefaultState(control) || isHTMLTextAreaElement(*control))
             return 0;
 
         if (isHTMLInputElement(*control) && control->willValidate()) {
             const HTMLInputElement& input = toHTMLInputElement(*control);
 
             // Return nothing if a file upload field or a password field are found.
-            if (input.isFileUpload() || input.isPasswordField())
+            if (input.type() == InputTypeNames::file || input.type() == InputTypeNames::password)
                 return 0;
 
             if (input.isTextField()) {
                 if (textElement) {
                     // The auto-complete bar only knows how to fill in one value.
                     // This form has multiple fields; don't treat it as searchable.
                     return 0;
                 }
                 textElement = toHTMLInputElement(control);
             }
@@ skipping 96 matching lines @@
 
     String action(formElement->action());
     KURL url(formElement->document().completeURL(action.isNull() ? "" : action));
     RefPtr<FormData> formData = FormData::create(encodedString);
     url.setQuery(formData->flattenToString());
     m_url = url;
     m_encoding = String(encoding.name());
 }
 
 } // namespace blink