rAc: fix some validation issues

chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc

 // 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.
 
 #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 1785 matching lines @@
 }
 
 // TODO(groby): Also add tests.
 ValidityMessages AutofillDialogControllerImpl::InputsAreValid(
     DialogSection section,
     const FieldValueMap& inputs) {
   ValidityMessages messages;
   if (inputs.empty())
     return messages;
 
-  FieldValueMap field_values;
-
   if (i18ninput::Enabled() && section != SECTION_CC) {
     AddressData address_data;
     i18ninput::CreateAddressData(
         base::Bind(&GetInfoFromInputs, base::ConstRef(inputs), section),
         &address_data);
 
     AddressProblems problems;
     if (GetValidator()->ValidateAddress(
             address_data,
             AddressProblemFilter(),
             &problems) == AddressValidator::SUCCESS) {
       common::AddressType address_type = section == SECTION_SHIPPING ?
           common::ADDRESS_TYPE_SHIPPING : common::ADDRESS_TYPE_BILLING;
       for (size_t i = 0; i < problems.size(); ++i) {
         const AddressProblem& problem = problems[i];
         bool sure = problem.type != AddressProblem::MISSING_REQUIRED_FIELD;
         base::string16 text = l10n_util::GetStringUTF16(problem.description_id);
         messages.Set(i18ninput::TypeForField(problem.field, address_type),
                      ValidityMessage(text, sure));
       }
     } else {
       // TODO(dbeam): disable submit button until able to successfully validate.
     }
   }
 
   for (FieldValueMap::const_iterator iter = inputs.begin();
        iter != inputs.end(); ++iter) {
     const ServerFieldType type = iter->first;
-    if (!messages.GetMessageOrDefault(type).text.empty())
-      continue;
-
     base::string16 text = InputValidityMessage(section, type, iter->second);
 
     // Skip empty/unchanged fields in edit mode. Ignore country as it always has
     // a value. If the individual field does not have validation errors, assume
     // it to be valid unless later proven otherwise.
     bool sure = InputWasEdited(type, iter->second) ||
                 AutofillType(type).GetStorableType() == ADDRESS_HOME_COUNTRY;
-
-    // Consider only individually valid fields for inter-field validation.
-    if (text.empty()) {
-      field_values[type] = iter->second;
-      // If the field is valid but can be invalidated by inter-field validation,
-      // assume it to be unsure.
-      if (type == CREDIT_CARD_EXP_4_DIGIT_YEAR ||
-          type == CREDIT_CARD_EXP_MONTH ||
-          type == CREDIT_CARD_VERIFICATION_CODE ||
-          type == PHONE_HOME_WHOLE_NUMBER ||
-          type == PHONE_BILLING_WHOLE_NUMBER) {
-        sure = false;
-      }
-    }
     messages.Set(type, ValidityMessage(text, sure));
   }
 
+  // For the convenience of using operator[].
+  FieldValueMap& field_values = const_cast<FieldValueMap&>(inputs);
   // Validate the date formed by month and year field. (Autofill dialog is
   // never supposed to have 2-digit years, so not checked).
   if (field_values.count(CREDIT_CARD_EXP_4_DIGIT_YEAR) &&
       field_values.count(CREDIT_CARD_EXP_MONTH) &&
       InputWasEdited(CREDIT_CARD_EXP_4_DIGIT_YEAR,
                      field_values[CREDIT_CARD_EXP_4_DIGIT_YEAR]) &&
       InputWasEdited(CREDIT_CARD_EXP_MONTH,
                      field_values[CREDIT_CARD_EXP_MONTH])) {
     ValidityMessage year_message(base::string16(), true);
     ValidityMessage month_message(base::string16(), true);
@@ skipping 1883 matching lines @@
   view_->UpdateButtonStrip();
 }
 
 void AutofillDialogControllerImpl::FetchWalletCookie() {
   net::URLRequestContextGetter* request_context = profile_->GetRequestContext();
   signin_helper_.reset(new wallet::WalletSigninHelper(this, request_context));
   signin_helper_->StartWalletCookieValueFetch();
 }
 
 }  // namespace autofill