Do not show untrustworthy strings in the basic auth dialog.

chrome/browser/ui/android/chrome_http_auth_handler.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/android/chrome_http_auth_handler.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #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"
 
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
 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() {}
 
 void ChromeHttpAuthHandler::Init() {
   DCHECK(java_chrome_http_auth_handler_.is_null());
   JNIEnv* env = AttachCurrentThread();
   java_chrome_http_auth_handler_.Reset(
       Java_ChromeHttpAuthHandler_create(env, reinterpret_cast<intptr_t>(this)));
 }
 
@@ skipping 34 matching lines @@
   }
 }
 
 void ChromeHttpAuthHandler::CancelAuth(JNIEnv* env, jobject) {
   if (observer_)
     observer_->CancelAuth();
 }
 
 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
 bool ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }