Do not show untrustworthy strings in the basic auth dialog.

chrome/browser/ui/android/chrome_http_auth_handler.cc

Index: chrome/browser/ui/android/chrome_http_auth_handler.cc
diff --git a/chrome/browser/ui/android/chrome_http_auth_handler.cc b/chrome/browser/ui/android/chrome_http_auth_handler.cc
index 881e205cccc5550d62843700b6483b8753460daf..bb4c587fd9dfd17d1d3457e593c829de77a1f9a8 100644
--- a/chrome/browser/ui/android/chrome_http_auth_handler.cc
+++ b/chrome/browser/ui/android/chrome_http_auth_handler.cc
@@ -11,6 +11,7 @@
 #include "base/android/scoped_java_ref.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/grit/generated_resources.h"
 #include "jni/ChromeHttpAuthHandler_jni.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -21,10 +22,9 @@ using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ScopedJavaLocalRef;
 
-ChromeHttpAuthHandler::ChromeHttpAuthHandler(const base::string16& explanation)
-    : observer_(NULL),
-      explanation_(explanation) {
-}
+ChromeHttpAuthHandler::ChromeHttpAuthHandler(const base::string16& authority,
+                                             const base::string16& explanation)
+    : observer_(NULL), authority_(authority), explanation_(explanation) {}

[msw, 2015/11/20 19:15:07]

nit: nullptr

[palmer, 2015/11/20 19:33:48]

Done.

 
 ChromeHttpAuthHandler::~ChromeHttpAuthHandler() {}
 
@@ -79,7 +79,10 @@ void ChromeHttpAuthHandler::CancelAuth(JNIEnv* env, jobject) {
 
 ScopedJavaLocalRef<jstring> ChromeHttpAuthHandler::GetMessageBody(
     JNIEnv* env, jobject) {
-  return ConvertUTF16ToJavaString(env, explanation_);
+  if (explanation_.length() == 0)

[msw, 2015/11/20 19:15:07]

nit: if (explanation_.empty())

[palmer, 2015/11/20 19:33:48]

Done.

+    return ConvertUTF16ToJavaString(env, authority_);
+  return ConvertUTF16ToJavaString(
+      env, authority_ + base::ASCIIToUTF16(" ") + explanation_);
 }
 
 // static