Turn on cardholder/recipient name disambiguation by default.

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/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/sha1.h"
@@ skipping 24 matching lines @@
   "Jan", "Feb", "Mar", "Apr", "May", "Jun",
   "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
 };
 
 const char* const kMonthsFull[] = {
   NULL,  // Padding so index 1 = month 1 = January.
   "January", "February", "March", "April", "May", "June",
   "July", "August", "September", "October", "November", "December",
 };
 
-bool ShouldDisambiguateServerNameTypes() {
-  std::string group_name =
-      base::FieldTrialList::FindFullName("DisambiguateAutofillServerNameTypes");
-
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisambiguateAutofillServerNameTypes)) {
-    return true;
-  }
-
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kTrustAutofillServerNameTypes)) {
-    return false;
-  }
-
-  return group_name == "Enabled";
-}
-
 // Returns true if the value was successfully set, meaning |value| was found in
 // the list of select options in |field|.
 bool SetSelectControlValue(const base::string16& value,
                            FormFieldData* field) {
   base::string16 value_lowercase = base::StringToLowerASCII(value);
 
   DCHECK_EQ(field->option_values.size(), field->option_contents.size());
   base::string16 best_match;
   for (size_t i = 0; i < field->option_values.size(); ++i) {
     if (value == field->option_values[i] ||
@@ skipping 395 matching lines @@
     phone_part_ = PHONE_SUFFIX;
   else
     phone_part_ = IGNORED;
 }
 
 AutofillType AutofillField::Type() const {
   if (html_type_ != HTML_TYPE_UNKNOWN)
     return AutofillType(html_type_, html_mode_);
 
   if (server_type_ != NO_SERVER_DATA) {
-    bool believe_server = true;
-    if (ShouldDisambiguateServerNameTypes()) {
-      believe_server =
-          !(server_type_ == NAME_FULL && heuristic_type_ == CREDIT_CARD_NAME) &&
-          !(server_type_ == CREDIT_CARD_NAME && heuristic_type_ == NAME_FULL);
-    }
+    // 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.
+    bool believe_server =
+        !(server_type_ == NAME_FULL && heuristic_type_ == CREDIT_CARD_NAME) &&
+        !(server_type_ == CREDIT_CARD_NAME && heuristic_type_ == NAME_FULL);
     if (believe_server)
       return AutofillType(server_type_);
   }
 
   return AutofillType(heuristic_type_);
 }
 
 bool AutofillField::IsEmpty() const {
   return value.empty();
 }
@@ skipping 58 matching lines @@
   if (field.phone_part() == AutofillField::PHONE_SUFFIX ||
       field_data.max_length == PhoneNumber::kSuffixLength) {
     return
         number.substr(PhoneNumber::kSuffixOffset, PhoneNumber::kSuffixLength);
   }
 
   return number;
 }
 
 }  // namespace autofill