Force at least first and last name for CREDIT_CARD_NAME when using Wallet.

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 <string>
 
 #include "base/bind.h"
@@ skipping 226 matching lines @@
 }
 
 // Signals that the user has opted in to geolocation services.  Factored out
 // into a separate method because all interaction with the geolocation provider
 // needs to happen on the IO thread, which is not the thread
 // AutofillDialogController lives on.
 void UserDidOptIntoLocationServices() {
   content::GeolocationProvider::GetInstance()->UserDidOptIntoLocationServices();
 }
 
+bool IsCardHolderNameValidForWallet(const string16& name) {
+  base::string16 whitespace_collapsed_name = CollapseWhitespace(name, true);
+  std::vector<base::string16> split_name;
+  SplitString(whitespace_collapsed_name, ' ', &split_name);
+  return split_name.size() >= 2;
+}
+
 }  // namespace
 
 AutofillDialogController::~AutofillDialogController() {}
 
 AutofillDialogControllerImpl::~AutofillDialogControllerImpl() {
   if (popup_controller_)
     popup_controller_->Hide();
 
   GetMetricLogger().LogDialogInitialUserState(
       GetDialogType(), initial_user_state_);
@@ skipping 849 matching lines @@
             field_values[CREDIT_CARD_EXP_4_DIGIT_YEAR],
             field_values[CREDIT_CARD_EXP_MONTH],
             base::Time::Now())) {
       invalid_messages[CREDIT_CARD_EXP_MONTH] =
           ASCIIToUTF16("more complicated message");
       invalid_messages[CREDIT_CARD_EXP_4_DIGIT_YEAR] =
           ASCIIToUTF16("more complicated message");
     }
   }
 
+  // Wallet requires a first and last name.
+  if (field_values.count(CREDIT_CARD_NAME)) {

[Evan Stade, 2013/05/23 23:28:40]

can you put this in InputValidityMessage()? InputsAreValid should handle checks
that only depend on a single field. InputsAreValid handles checks that depend on
multiple fields.

p.s. perhaps InputValidityMessage is not as good a name as SingleInputIsValid or
something, and that's why this distinction was unclear.

[ahutter, 2013/05/24 18:36:02]

Done.

+    if (IsPayingWithWallet() &&
+        !IsCardHolderNameValidForWallet(field_values[CREDIT_CARD_NAME])) {
+      invalid_messages[CREDIT_CARD_NAME] =
+          l10n_util::GetStringUTF16(
+              IDS_AUTOFILL_DIALOG_VALIDATION_WALLET_REQUIRES_TWO_NAMES);
+    }
+  }
+
   // If there is a credit card number and a CVC, validate them together.
   if (field_values.count(CREDIT_CARD_NUMBER) &&
       field_values.count(CREDIT_CARD_VERIFICATION_CODE) &&
       InputIsValid(CREDIT_CARD_NUMBER, field_values[CREDIT_CARD_NUMBER])) {
     if (!autofill::IsValidCreditCardSecurityCode(
             field_values[CREDIT_CARD_VERIFICATION_CODE],
             field_values[CREDIT_CARD_NUMBER])) {
       invalid_messages[CREDIT_CARD_VERIFICATION_CODE] =
           ASCIIToUTF16("CVC doesn't match card type!");
     }
@@ skipping 1450 matching lines @@
         AutofillMetrics::DIALOG_USER_SIGNED_IN_NO_WALLET_NO_AUTOFILL;
   }
 
   // Has Wallet items.
   return has_autofill_profiles ?
       AutofillMetrics::DIALOG_USER_SIGNED_IN_HAS_WALLET_HAS_AUTOFILL :
       AutofillMetrics::DIALOG_USER_SIGNED_IN_HAS_WALLET_NO_AUTOFILL;
 }
 
 }  // namespace autofill