[Password manager] Human readable origins for Android credentials on chrome://settings/passwords

chrome/browser/ui/webui/options/password_manager_handler.cc

Index: chrome/browser/ui/webui/options/password_manager_handler.cc
diff --git a/chrome/browser/ui/webui/options/password_manager_handler.cc b/chrome/browser/ui/webui/options/password_manager_handler.cc
index 374e6e58cbb0ef2d542f7ce6e16df26bc80b1d5d..63fc842c59f0a94293948fabef801b6bcecbf79c 100644
--- a/chrome/browser/ui/webui/options/password_manager_handler.cc
+++ b/chrome/browser/ui/webui/options/password_manager_handler.cc
@@ -45,9 +45,9 @@ namespace options {
 namespace {
 // The following constants should be synchronized with the constants in
 // chrome/browser/resources/options/password_manager_list.js.
-const char kOriginField[] = "origin";
-const char kShownUrlField[] = "shownUrl";
-const char kIsAndroidUriField[] = "isAndroidUri";
+const char kUrlField[] = "url";
+const char kShownOriginField[] = "shownOrigin";
+const char kIsClickable[] = "isClickable";
 const char kIsSecureField[] = "isSecure";
 const char kUsernameField[] = "username";
 const char kPasswordField[] = "password";
@@ -58,16 +58,18 @@ const char kFederationField[] = "federation";
 void CopyOriginInfoOfPasswordForm(const autofill::PasswordForm& form,
                                   const std::string& languages,
                                   base::DictionaryValue* entry) {
+  bool origin_is_clickable = false;
+  GURL link_url;
+  entry->SetString(kShownOriginField,
+                   password_manager::GetShownOriginAndLinkUrl(
+                       form, languages, &link_url, &origin_is_clickable));
+  DCHECK(link_url.is_valid());
   entry->SetString(
-      kOriginField,
-      url_formatter::FormatUrl(
-          form.origin, languages, url_formatter::kFormatUrlOmitNothing,
-          net::UnescapeRule::SPACES, nullptr, nullptr, nullptr));
-  bool is_android_uri = false;
-  entry->SetString(kShownUrlField, password_manager::GetShownOrigin(
-                                       form, languages, &is_android_uri));
-  entry->SetBoolean(kIsAndroidUriField, is_android_uri);
-  entry->SetBoolean(kIsSecureField, content::IsOriginSecure(form.origin));
+      kUrlField, url_formatter::FormatUrl(
+                     link_url, languages, url_formatter::kFormatUrlOmitNothing,
+                     net::UnescapeRule::SPACES, nullptr, nullptr, nullptr));
+  entry->SetBoolean(kIsClickable, origin_is_clickable);
+  entry->SetBoolean(kIsSecureField, content::IsOriginSecure(link_url));
 }
 
 }  // namespace