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_(nullptr), authority_(authority), explanation_(explanation) {}
 
 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_.empty())
+    return ConvertUTF16ToJavaString(env, authority_);
+  return ConvertUTF16ToJavaString(
+      env, authority_ + base::ASCIIToUTF16(" ") + explanation_);

[Yaron, 2015/11/23 16:56:14]

You may want to put this into another TextView. Otherwise on a landscape tablet,
this will just be a continuation of the previous string - is that what you want?

[palmer, 2015/11/24 00:15:42]

Well, there's not much vertical room to spare. You can see screenshots on the
bug: https://code.google.com/p/chromium/issues/detail?id=544244#c19

[Yaron, 2015/11/24 16:01:28]

hmm. I suppose that's reasonable.

+newt in case he has concerns or ideas. I know that in general it's not good to
assume a space between two sentences localizes well but perhaps we don't have
the room here.

[newt (away), 2015/11/24 16:57:28]

A space between sentences doesn't localize especially well (e.g. Chinese doesn't
use spaces between sentences).

I've wondered what the best option is in cases like this as well, so I just sent
an email to the localization folks (and cc'd you) to hear their thoughts.

 }
 
 // static
 bool ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }