[Autofill] Autofill fails to fill credit card number when split across fields.

components/autofill/core/browser/autofill_field.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 "components/autofill/core/browser/autofill_field.h"
 
 #include "base/logging.h"
 #include "base/sha1.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
@@ skipping 280 matching lines @@
     } else if (field.phone_part() == AutofillField::PHONE_SUFFIX ||
                field_data->max_length == PhoneNumber::kSuffixLength) {
       value = number.substr(PhoneNumber::kSuffixOffset,
                             PhoneNumber::kSuffixLength);
     }
   }
 
   field_data->value = value;
 }
 
+// Set |field_data|'s value to |cc_number|, or possibly an appropriate substring
+// of |cc_number| for cases where credit card number splits across multiple HTML
+// form input fields.
+// The |field| specifies the |credit_card_number_start_index_| to the substring
+// within credit card number.
+void FillCreditCardNumberField(const AutofillField& field,
+                               const base::string16& cc_number,

[Ilya Sherman, 2014/08/12 04:23:41]

nit: Please don't use the abbreviation "cc".  Instead, either spell out
"credit_card", or just drop the prefix.

[Pritam Nikam, 2014/08/12 14:00:37]

Done.

+                               FormFieldData* field_data) {
+  base::string16 value = cc_number;
+
+  // |filed|'s max_length truncates credit card number to fit within.

[Ilya Sherman, 2014/08/12 04:23:41]

nit: "filed" -> "field"

[Pritam Nikam, 2014/08/12 14:00:37]

Done.

+  if (field.credit_card_number_start_index() &&

[Ilya Sherman, 2014/08/12 04:23:41]

There's no need to check whether the start index is zero or not, since the
functionality is equivalent, and the performance difference is not worth
worrying about for this code.

[Pritam Nikam, 2014/08/12 14:00:37]

Done.

+      field.credit_card_number_start_index() < value.length())
+    value =
+        value.substr(field.credit_card_number_start_index(),
+                     value.length() - field.credit_card_number_start_index());

[Ilya Sherman, 2014/08/12 04:23:41]

You can shorten this by dropping the second argument to substr.  Unless I'm
misreading the code, I believe that should give an equivalent result.

[Pritam Nikam, 2014/08/12 14:00:37]

Done.

+
+  field_data->value = value;
+}
+
 // Fills in the select control |field| with |value|.  If an exact match is not
 // found, falls back to alternate filling strategies based on the |type|.
 bool FillSelectControl(const AutofillType& type,
                        const base::string16& value,
                        const std::string& app_locale,
                        FormFieldData* field) {
   DCHECK_EQ("select-one", field->form_control_type);
 
   // Guard against corrupted values passed over IPC.
   if (field->option_values.size() != field->option_contents.size())
@@ skipping 78 matching lines @@
   return base::UintToString(hash32);
 }
 
 }  // namespace
 
 AutofillField::AutofillField()
     : server_type_(NO_SERVER_DATA),
       heuristic_type_(UNKNOWN_TYPE),
       html_type_(HTML_TYPE_UNKNOWN),
       html_mode_(HTML_MODE_NONE),
-      phone_part_(IGNORED) {
+      phone_part_(IGNORED),
+      credit_card_number_start_index_(0) {
 }
 
 AutofillField::AutofillField(const FormFieldData& field,
                              const base::string16& unique_name)
     : FormFieldData(field),
       unique_name_(unique_name),
       server_type_(NO_SERVER_DATA),
       heuristic_type_(UNKNOWN_TYPE),
       html_type_(HTML_TYPE_UNKNOWN),
       html_mode_(HTML_MODE_NONE),
-      phone_part_(IGNORED) {
+      phone_part_(IGNORED),
+      credit_card_number_start_index_(0) {
 }
 
-AutofillField::~AutofillField() {}
+AutofillField::~AutofillField() {
+}
 
 void AutofillField::set_heuristic_type(ServerFieldType type) {
   if (type >= 0 && type < MAX_VALID_FIELD_TYPE &&
       type != FIELD_WITH_DEFAULT_VALUE) {
     heuristic_type_ = type;
   } else {
     NOTREACHED();
     // This case should not be reachable; but since this has potential
     // implications on data uploaded to the server, better safe than sorry.
     heuristic_type_ = UNKNOWN_TYPE;
@@ skipping 55 matching lines @@
   if (type.GetStorableType() == PHONE_HOME_NUMBER) {
     FillPhoneNumberField(field, value, field_data);
     return true;
   } else if (field_data->form_control_type == "select-one") {
     return FillSelectControl(type, value, app_locale, field_data);
   } else if (field_data->form_control_type == "month") {
     return FillMonthControl(value, field_data);
   } else if (type.GetStorableType() == ADDRESS_HOME_STREET_ADDRESS) {
     FillStreetAddress(value, address_language_code, field_data);
     return true;
+  } else if (type.GetStorableType() == CREDIT_CARD_NUMBER) {
+    FillCreditCardNumberField(field, value, field_data);
+    return true;
   }
 
   field_data->value = value;
   return true;
 }
 
 }  // namespace autofill