Use FormatUrlForSecurityDisplay at BluetoothChooserAndroid constructor

chrome/browser/ui/android/bluetooth_chooser_android.cc

 // Copyright 2015 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/bluetooth_chooser_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/chrome_security_state_model_client.h"
 #include "chrome/browser/ui/android/view_android_helper.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
+#include "components/prefs/pref_service.h"
+#include "components/url_formatter/elide_url.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/render_frame_host.h"
 #include "jni/BluetoothChooserDialog_jni.h"
 #include "ui/android/window_android.h"
+#include "url/gurl.h"
 #include "url/origin.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ScopedJavaLocalRef;
 
 BluetoothChooserAndroid::BluetoothChooserAndroid(
     content::RenderFrameHost* frame,
     const EventHandler& event_handler)
     : web_contents_(content::WebContents::FromRenderFrameHost(frame)),
       event_handler_(event_handler) {
   const url::Origin origin = frame->GetLastCommittedOrigin();
   DCHECK(!origin.unique());
 
   base::android::ScopedJavaLocalRef<jobject> window_android =
       content::ContentViewCore::FromWebContents(web_contents_)
           ->GetWindowAndroid()
           ->GetJavaObject();
 
   ChromeSecurityStateModelClient* security_model_client =
       ChromeSecurityStateModelClient::FromWebContents(web_contents_);
   DCHECK(security_model_client);
 
   // Create (and show) the BluetoothChooser dialog.
   JNIEnv* env = AttachCurrentThread();
-  ScopedJavaLocalRef<jstring> origin_string =
-      ConvertUTF8ToJavaString(env, origin.Serialize());
+  Profile* profile =
+      Profile::FromBrowserContext(web_contents_->GetBrowserContext());
+  std::string languages =
+      profile->GetPrefs()->GetString(prefs::kAcceptLanguages);
+  base::android::ScopedJavaLocalRef<jstring> origin_string =
+      base::android::ConvertUTF16ToJavaString(
+          env, url_formatter::FormatUrlForSecurityDisplay(
+                   GURL(origin.Serialize()), languages));

[Yaron, 2016/03/09 04:19:59]

err, serializing the origin and then creating a GURL isn't the right thing to
do.

It's either the case that you use:
1) frame->GetLastCommittedOrigin()  directly (i.e. I"m mistaken)
2)  url_formatter::FormatUrlForSecurityDisplay(frame->GetLastCommittedURL())

[Jeffrey Yasskin, 2016/03/09 16:40:10]

Hm, do we want to be switching to url::Origins everywhere that's using URLs for
security reasons, or not? If we do, there should be a
FormatOriginForSecurityDisplay.

[palmer, 2016/03/09 20:19:39]

Ultimately, yes, we want to use url::Origin where appropriate (I am in the
middle of 1 of the many necessary large refactorings, for example). Thus we will
need a FormatOriginForSecurityDisplay. Until then, using
url_formatter::FormatUrlForSecurityDisplay(frame->GetLastCommittedURL()) is
probably cleanest.

[juncai, 2016/03/10 00:13:54]

Done.

   java_dialog_.Reset(Java_BluetoothChooserDialog_create(
       env, window_android.obj(), origin_string.obj(),
       security_model_client->GetSecurityInfo().security_level,
       reinterpret_cast<intptr_t>(this)));
 }
 
 BluetoothChooserAndroid::~BluetoothChooserAndroid() {
   if (!java_dialog_.is_null()) {
     Java_BluetoothChooserDialog_closeDialog(AttachCurrentThread(),
                                             java_dialog_.obj());
@@ skipping 108 matching lines @@
 // static
 bool BluetoothChooserAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 void BluetoothChooserAndroid::OpenURL(const char* url) {
   web_contents_->OpenURL(content::OpenURLParams(
       GURL(url), content::Referrer(), NEW_FOREGROUND_TAB,
       ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false /* is_renderer_initiated */));
 }