bluetooth-chooser: Refactor and clean up bluetooth chooser

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 193 matching lines @@
   base::android::ScopedJavaLocalRef<jstring> device_name =
       base::android::ConvertUTF16ToJavaString(env, device->product_string());
   Java_UsbChooserDialog_addDevice(env, java_dialog_, device_guid, device_name);
 }
 
 void UsbChooserDialogAndroid::RemoveDeviceFromChooserDialog(
     scoped_refptr<UsbDevice> device) const {
   JNIEnv* env = base::android::AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jstring> device_guid =
       base::android::ConvertUTF8ToJavaString(env, device->guid());
-  base::android::ScopedJavaLocalRef<jstring> device_name =
-      base::android::ConvertUTF16ToJavaString(env, device->product_string());
-  Java_UsbChooserDialog_removeDevice(env, java_dialog_, device_guid,
-                                     device_name);
+  Java_UsbChooserDialog_removeDevice(env, java_dialog_, device_guid);
 }
 
 void UsbChooserDialogAndroid::OpenUrl(const std::string& url) {
   content::WebContents::FromRenderFrameHost(render_frame_host_)
       ->OpenURL(
           content::OpenURLParams(GURL(url), content::Referrer(),
                                  WindowOpenDisposition::NEW_FOREGROUND_TAB,
                                  ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
                                  false));  // is_renderer_initiated
 }
@@ skipping 11 matching lines @@
 
   return device::FindInWebUsbAllowedOrigins(
       device->webusb_allowed_origins(),
       render_frame_host_->GetLastCommittedURL().GetOrigin());
 }
 
 // static
 bool UsbChooserDialogAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }