[Smart Lock] Display identity provider information in account chooser infobar.

chrome/android/java/src/org/chromium/chrome/browser/infobar/AccountChooserInfoBar.java

Index: chrome/android/java/src/org/chromium/chrome/browser/infobar/AccountChooserInfoBar.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/AccountChooserInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/AccountChooserInfoBar.java
index 0f35999e9774f033f11166a3b6cdad724f0d3775..801c858b93e77d111e1ac8b335e9d0321fef16f5 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/AccountChooserInfoBar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/AccountChooserInfoBar.java
@@ -98,10 +98,13 @@ public class AccountChooserInfoBar extends InfoBar {
                 }
                 ImageView avatarView = (ImageView) convertView.findViewById(R.id.profile_image);
                 TextView usernameView = (TextView) convertView.findViewById(R.id.username);
-                TextView displayNameView = (TextView) convertView.findViewById(R.id.display_name);
+                TextView smallTextView = (TextView) convertView.findViewById(R.id.display_name);
                 Credential credential = getItem(position);
                 usernameView.setText(credential.getUsername());
-                displayNameView.setText(credential.getDisplayName());
+                String smallText = credential.getFederation().isEmpty()
+                        ? credential.getFederation()
+                        : credential.getDisplayName();
+                smallTextView.setText(smallText);
                 // TODO(melandory): View should show proper avatar. Temporarily the view shows
                 // blue man icon.
                 avatarView.setImageResource(R.drawable.account_management_no_picture);