Fix the password bubble titles for android.

chrome/browser/ui/passwords/manage_passwords_view_utils.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/passwords/manage_passwords_view_utils.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 60 matching lines @@
   return std::make_pair(upper_string, lower_string);
 }
 
 void GetSavePasswordDialogTitleTextAndLinkRange(
     const GURL& user_visible_url,
     const GURL& form_origin_url,
     bool is_smartlock_branding_enabled,
     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;
   switch (dialog_type) {
     case PasswordTittleType::SAVE_PASSWORD:
       title_id = IDS_SAVE_PASSWORD;
       break;
     case PasswordTittleType::SAVE_ACCOUNT:
       title_id = IDS_SAVE_ACCOUNT;
       break;
     case PasswordTittleType::UPDATE_PASSWORD:
       title_id = IDS_UPDATE_PASSWORD;
       break;
   }
 
   // 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.
     replacements.push_back(url_formatter::FormatUrlForSecurityDisplay(
         form_origin_url, std::string()));
   }
 
   if (is_smartlock_branding_enabled) {
     // "Google Smart Lock" should be a hyperlink.
     base::string16 title_link =
         l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_SMART_LOCK);
     replacements.insert(replacements.begin(), title_link);
     *title = l10n_util::GetStringFUTF16(title_id, replacements, &offsets);
     *title_link_range =
         gfx::Range(offsets[0], offsets[0] + title_link.length());
   } else {
     replacements.insert(
         replacements.begin(),
         l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_TITLE_BRAND));
     *title = l10n_util::GetStringFUTF16(title_id, replacements, &offsets);
   }
 }
 
 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());
     *title = l10n_util::GetStringFUTF16(
         IDS_MANAGE_PASSWORDS_TITLE_DIFFERENT_DOMAIN, formatted_url);
   } else {
     *title = l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_TITLE);
   }
 }
 
@@ skipping 33 matching lines @@
              : form.username_value;
 }
 
 bool IsSyncingAutosignSetting(Profile* profile) {
   const ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile);
   return (sync_service && sync_service->IsFirstSetupComplete() &&
           sync_service->IsSyncActive() &&
           sync_service->GetActiveDataTypes().Has(syncer::PRIORITY_PREFERENCES));
 }