Android: Get AutofillProfile summary labels from PersonalDataManagerAndroid

components/autofill/core/browser/autofill_profile.cc

Index: components/autofill/core/browser/autofill_profile.cc
diff --git a/components/autofill/core/browser/autofill_profile.cc b/components/autofill/core/browser/autofill_profile.cc
index 250b7a17694ca6261956385fac8769028cc7c9b5..e3dc4e270d0d7001ab4ba7575dd6095171bfdfb1 100644
--- a/components/autofill/core/browser/autofill_profile.cc
+++ b/components/autofill/core/browser/autofill_profile.cc
@@ -71,12 +71,16 @@ void GetFieldsForDistinguishingProfiles(
     COMPANY_NAME,
   };
 
+  std::vector<ServerFieldType> default_fields;
   if (!suggested_fields) {
-    DCHECK_EQ(excluded_field, UNKNOWN_TYPE);
-    distinguishing_fields->assign(
+    default_fields.assign(
         kDefaultDistinguishingFields,
         kDefaultDistinguishingFields + arraysize(kDefaultDistinguishingFields));
-    return;
+    suggested_fields = &default_fields;
+    if (excluded_field == UNKNOWN_TYPE) {

[Ilya Sherman, 2014/08/06 01:28:17]

Why might there be an excluded field without a list of suggested fields?  The
excluded field is supposed to be the one the user is interacting with; but if
there's a field that the user is interacting with, then the suggested_fields
should be all the other field types found in the form (and no types that aren't
found in the form).

[Evan Stade, 2014/08/06 17:59:19]

Because Android puts the full name on the first line and further distinguishing
info on the second line for the profile summaries. (In contrast, desktop puts
everything on one line.) Thus to get the second-line summary for Android, we
want to exclude FULL_NAME but otherwise rely on the default distinguishing
fields.

[Evan Stade, 2014/08/06 18:00:47]

(I'm talking about the preferences UI on desktop and Android; perhaps that
wasn't clear)

+      distinguishing_fields->swap(default_fields);
+      return;
+    }
   }
 
   // Keep track of which fields we've seen so that we avoid duplicate entries.