Turn on cardholder/recipient name disambiguation by default.

components/autofill/core/browser/autofill_field.cc

Index: components/autofill/core/browser/autofill_field.cc
diff --git a/components/autofill/core/browser/autofill_field.cc b/components/autofill/core/browser/autofill_field.cc
index bc1a4349b17ed567846618d07ab40a2ca38298b3..75a0d0a4220a61e4f8f9c92a523bbb12363974cf 100644
--- a/components/autofill/core/browser/autofill_field.cc
+++ b/components/autofill/core/browser/autofill_field.cc
@@ -42,23 +42,6 @@ const char* const kMonthsFull[] = {
   "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,
@@ -474,12 +457,13 @@ AutofillType AutofillField::Type() const {
     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_);
   }