Fixing Authentication Dialog for Proxy Authentication.

chrome/browser/ui/login/login_prompt.cc

Index: chrome/browser/ui/login/login_prompt.cc
diff --git a/chrome/browser/ui/login/login_prompt.cc b/chrome/browser/ui/login/login_prompt.cc
index 906fce73a0f7dc721d1713a4bc2fe11be688416e..c0a8d320eb428d6e2f84de80d2bc54b90147ff60 100644
--- a/chrome/browser/ui/login/login_prompt.cc
+++ b/chrome/browser/ui/login/login_prompt.cc
@@ -125,12 +125,20 @@ void ShowLoginPrompt(const GURL& request_url,
 
   base::string16 authority =
       url_formatter::FormatUrlForSecurityDisplay(request_url, languages);
-  base::string16 explanation =
-      elided_realm.empty()
-          ? l10n_util::GetStringFUTF16(IDS_LOGIN_DIALOG_DESCRIPTION_NO_REALM,
-                                       authority)
-          : l10n_util::GetStringFUTF16(IDS_LOGIN_DIALOG_DESCRIPTION, authority,
-                                       elided_realm);
+  base::string16 explanation;
+  if (auth_info->is_proxy) {
+    explanation = elided_realm.empty()
+        ? l10n_util::GetStringFUTF16(
+            IDS_LOGIN_DIALOG_DESCRIPTION_PROXY_NO_REALM, authority)
+        : l10n_util::GetStringFUTF16(IDS_LOGIN_DIALOG_DESCRIPTION_PROXY,
+                                     authority, elided_realm);

[asanka, 2016/06/14 15:00:30]

The |authority| here is based on the request URL, not the proxy server. The
resulting prompt is unfortunately misleading. See issue 613626.

+  } else {
+    explanation = elided_realm.empty()
+        ? l10n_util::GetStringFUTF16(IDS_LOGIN_DIALOG_DESCRIPTION_NO_REALM,
+                                     authority)
+        : l10n_util::GetStringFUTF16(IDS_LOGIN_DIALOG_DESCRIPTION, authority,
+                                     elided_realm);
+  }
 
   password_manager::PasswordManager* password_manager =
       handler->GetPasswordManagerForLogin();