Display origin for WebBluetooth and WebUSB chooser on Android

chrome/browser/ui/android/usb_chooser_dialog_android.cc

 // Copyright 2016 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/usb_chooser_dialog_android.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 42 matching lines @@
   // Create (and show) the UsbChooser dialog.
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(render_frame_host_);
   base::android::ScopedJavaLocalRef<jobject> window_android =
       content::ContentViewCore::FromWebContents(web_contents)
           ->GetWindowAndroid()
           ->GetJavaObject();
   JNIEnv* env = base::android::AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jstring> origin_string =
       base::android::ConvertUTF16ToJavaString(
-          env, url_formatter::FormatUrlForSecurityDisplay(
-                   render_frame_host->GetLastCommittedURL()));
+          env, url_formatter::FormatUrlForSecurityDisplay(GURL(
+                   render_frame_host->GetLastCommittedOrigin().Serialize())));
   ChromeSecurityStateModelClient* security_model_client =
       ChromeSecurityStateModelClient::FromWebContents(web_contents);
   DCHECK(security_model_client);
   java_dialog_.Reset(Java_UsbChooserDialog_create(
       env, window_android.obj(), origin_string.obj(),
       security_model_client->GetSecurityInfo().security_level,
       reinterpret_cast<intptr_t>(this)));
 
   if (!java_dialog_.is_null()) {
     usb_service->GetDevices(
@@ skipping 139 matching lines @@
       ->OpenURL(content::OpenURLParams(GURL(url), content::Referrer(),
                                        NEW_FOREGROUND_TAB,
                                        ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
                                        false));  // is_renderer_initiated
 }
 
 // static
 bool UsbChooserDialogAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }