[Autofill] Add credit card first and last name heuristics predictions.

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 <stdint.h>
 
 #include "base/command_line.h"
 #include "base/i18n/string_search.h"
@@ skipping 481 matching lines @@
     phone_part_ = IGNORED;
 }
 
 AutofillType AutofillField::Type() const {
   if (html_type_ != HTML_TYPE_UNSPECIFIED)
     return AutofillType(html_type_, html_mode_);
 
   if (server_type_ != NO_SERVER_DATA) {
     // See http://crbug.com/429236 for background on why we might not always
     // believe the server.
-    // See http://crbug.com/441488 for potential improvements to the server
-    // which may obviate the need for this logic.
+    // TODO(http://crbug.com/589129) investigate how well the server is doing in
+    // regard to credit card predictions.
     bool believe_server =
-        !(server_type_ == NAME_FULL && heuristic_type_ == CREDIT_CARD_NAME) &&
-        !(server_type_ == CREDIT_CARD_NAME && heuristic_type_ == NAME_FULL) &&
+        !(server_type_ == NAME_FULL &&
+          heuristic_type_ == CREDIT_CARD_NAME_FULL) &&
+        !(server_type_ == CREDIT_CARD_NAME_FULL &&
+          heuristic_type_ == NAME_FULL) &&
+        !(server_type_ == NAME_FIRST &&
+          heuristic_type_ == CREDIT_CARD_NAME_FIRST) &&
+        !(server_type_ == NAME_LAST &&
+          heuristic_type_ == CREDIT_CARD_NAME_LAST) &&
         // CVC is sometimes type="password", which tricks the server.
         // See http://crbug.com/469007
         !(AutofillType(server_type_).group() == PASSWORD_FIELD &&
-              heuristic_type_ == CREDIT_CARD_VERIFICATION_CODE);
+          heuristic_type_ == CREDIT_CARD_VERIFICATION_CODE);
     if (believe_server)
       return AutofillType(server_type_);
   }
 
   return AutofillType(heuristic_type_);
 }
 
 bool AutofillField::IsEmpty() const {
   return value.empty();
 }
@@ skipping 103 matching lines @@
     if (compare.StringsEqual(value_stripped, option_contents)) {
       if (index)
         *index = i;
       return true;
     }
   }
   return false;
 }
 
 }  // namespace autofill