Use GetLastCommittedOrigin instead of GetLastCommittedURL in bluetooth chooser

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/ssl/chrome_security_state_model_client.h"
 #include "chrome/browser/ui/android/view_android_helper.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "jni/BluetoothChooserDialog_jni.h"
 #include "ui/android/window_android.h"
+#include "url/origin.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ScopedJavaLocalRef;
 
 BluetoothChooserAndroid::BluetoothChooserAndroid(
     content::WebContents* web_contents,
     const EventHandler& event_handler,
-    const GURL& origin)
+    const url::Origin& origin)
     : event_handler_(event_handler) {
+  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.spec());
+      ConvertUTF8ToJavaString(env, origin.Serialize());
   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 98 matching lines @@
 void BluetoothChooserAndroid::ShowNeedLocationPermissionLink(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   event_handler_.Run(Event::SHOW_NEED_LOCATION_HELP, "");
 }
 
 // static
 bool BluetoothChooserAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }