Adjust displayed phone number for prefix/suffix case.

components/autofill/core/browser/autofill_manager.cc

Index: components/autofill/core/browser/autofill_manager.cc
diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
index 76215f39b38046eb842c258c13560f40b08cc853..a9bc6bfc80a9d1498926618134341afee294d50f 100644
--- a/components/autofill/core/browser/autofill_manager.cc
+++ b/components/autofill/core/browser/autofill_manager.cc
@@ -510,6 +510,22 @@ void AutofillManager::OnQueryFormFieldAutofill(int query_id,
           metric_logger_->LogAddressSuggestionsCount(values.size());
           has_logged_address_suggestions_count_ = true;
         }
+
+        // Adjust phone number to display in prefix/suffix case.
+        FormData result = form;
+        if (type.GetStorableType() == PHONE_HOME_NUMBER) {
+          for (std::vector<FormFieldData>::iterator iter =
+                   result.fields.begin();
+               iter != result.fields.end();
+               ++iter) {
+            if ((*iter) == field) {
+              for (size_t i = 0; i < values.size(); ++i) {
+                values[i] = AutofillField::GetPhoneNumberValue(
+                    *autofill_field, values[i], *iter);
+              }
+            }
+          }
+        }
       }
     }
   }