Fix the password bubble titles for android.

chrome/browser/ui/passwords/manage_passwords_view_utils.cc

Index: chrome/browser/ui/passwords/manage_passwords_view_utils.cc
diff --git a/chrome/browser/ui/passwords/manage_passwords_view_utils.cc b/chrome/browser/ui/passwords/manage_passwords_view_utils.cc
index 274d75439eda57a4ac5523abbdb66a532fbb4dd9..3f43c549cec4484e7009089209807dd7f1af14c5 100644
--- a/chrome/browser/ui/passwords/manage_passwords_view_utils.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_view_utils.cc
@@ -78,6 +78,8 @@ void GetSavePasswordDialogTitleTextAndLinkRange(
     PasswordTittleType dialog_type,
     base::string16* title,
     gfx::Range* title_link_range) {
+  DCHECK(!password_manager::FacetURI::FromPotentiallyInvalidSpec(

[engedy, 2016/03/09 15:33:16]

nit:

DCHECK(!password_manager::IsValidAndroidFacetURI(form_origin_url.spec());

Same below.

[vasilii, 2016/03/10 11:11:36]

Done.

+      form_origin_url.spec()).IsValidAndroidFacetURI());
   std::vector<size_t> offsets;
   std::vector<base::string16> replacements;
   int title_id = 0;
@@ -96,14 +98,7 @@ void GetSavePasswordDialogTitleTextAndLinkRange(
   // Check whether the registry controlled domains for user-visible URL (i.e.
   // the one seen in the omnibox) and the password form post-submit navigation
   // URL differs or not.
-  password_manager::FacetURI facet_uri =
-      password_manager::FacetURI::FromPotentiallyInvalidSpec(
-          form_origin_url.spec());
-  if (facet_uri.IsValidAndroidFacetURI()) {
-    title_id = IDS_SAVE_PASSWORD_TITLE;
-    replacements.push_back(
-        base::ASCIIToUTF16(GetHumanReadableOriginForAndroidUri(facet_uri)));
-  } else if (!SameDomainOrHost(user_visible_url, form_origin_url)) {
+  if (!SameDomainOrHost(user_visible_url, form_origin_url)) {
     title_id = IDS_SAVE_PASSWORD_TITLE;
     // TODO(palmer): Look into passing real language prefs here, not "".
     // crbug.com/498069.
@@ -130,17 +125,12 @@ void GetSavePasswordDialogTitleTextAndLinkRange(
 void GetManagePasswordsDialogTitleText(const GURL& user_visible_url,
                                        const GURL& password_origin_url,
                                        base::string16* title) {
+  DCHECK(!password_manager::FacetURI::FromPotentiallyInvalidSpec(
+      password_origin_url.spec()).IsValidAndroidFacetURI());
   // Check whether the registry controlled domains for user-visible URL
   // (i.e. the one seen in the omnibox) and the managed password origin URL
   // differ or not.
-  password_manager::FacetURI facet_uri =
-      password_manager::FacetURI::FromPotentiallyInvalidSpec(
-          password_origin_url.spec());
-  if (facet_uri.IsValidAndroidFacetURI()) {
-    *title = l10n_util::GetStringFUTF16(
-        IDS_MANAGE_PASSWORDS_TITLE_DIFFERENT_DOMAIN,
-        base::ASCIIToUTF16(GetHumanReadableOriginForAndroidUri(facet_uri)));
-  } else if (!SameDomainOrHost(user_visible_url, password_origin_url)) {
+  if (!SameDomainOrHost(user_visible_url, password_origin_url)) {
     // TODO(palmer): Look into passing real language prefs here, not "".
     base::string16 formatted_url = url_formatter::FormatUrlForSecurityDisplay(
         password_origin_url, std::string());