Fixing Authentication Dialog for Proxy Authentication.

chrome/browser/ui/login/login_prompt.cc

 // Copyright (c) 2012 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/login/login_prompt.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 107 matching lines @@
   content::WebContents* web_contents = handler->GetWebContentsForLogin();
   if (web_contents) {
     Profile* profile =
         Profile::FromBrowserContext(web_contents->GetBrowserContext());
     if (profile)
       languages = profile->GetPrefs()->GetString(prefs::kAcceptLanguages);
   }
 
   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();
 
   if (!password_manager) {
 #if defined(ENABLE_EXTENSIONS)
     // A WebContents in a <webview> (a GuestView type) does not have a password
     // manager, but still needs to be able to show login prompts.
     if (guest_view::GuestViewBase::FromWebContents(parent_contents)) {
       handler->BuildViewWithoutPasswordManager(explanation);
@@ skipping 463 matching lines @@
     signon_realm = auth_info.challenger.ToString();
     signon_realm.append("/");
   } else {
     // Take scheme, host, and port from the url.
     signon_realm = url.GetOrigin().spec();
     // This ends with a "/".
   }
   signon_realm.append(auth_info.realm);
   return signon_realm;
 }