Use the task scheduler for blocking tasks in the USB service on Linux

device/usb/usb_device_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 "device/usb/usb_device_android.h"
 
 #include "base/android/build_info.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "device/usb/usb_configuration_android.h"
 #include "device/usb/usb_descriptors.h"
 #include "device/usb/usb_device_handle_android.h"
 #include "device/usb/usb_interface_android.h"
 #include "device/usb/usb_service_android.h"
 #include "device/usb/webusb_descriptors.h"
 #include "jni/ChromeUsbDevice_jni.h"
 
 using base::android::ConvertJavaStringToUTF16;
 using base::android::JavaRef;
 using base::android::ScopedJavaLocalRef;
 
 namespace device {
 
 // static
 scoped_refptr<UsbDeviceAndroid> UsbDeviceAndroid::Create(
     JNIEnv* env,
     base::WeakPtr<UsbServiceAndroid> service,
-    scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
     const JavaRef<jobject>& usb_device) {
   ScopedJavaLocalRef<jobject> wrapper =
       Java_ChromeUsbDevice_create(env, usb_device);
   uint16_t device_version = 0;
   if (base::android::BuildInfo::GetInstance()->sdk_int() >= 23)
     device_version = Java_ChromeUsbDevice_getDeviceVersion(env, wrapper);
   base::string16 manufacturer_string, product_string, serial_number;
   if (base::android::BuildInfo::GetInstance()->sdk_int() >= 21) {
     manufacturer_string = ConvertJavaStringToUTF16(
         env, Java_ChromeUsbDevice_getManufacturerName(env, wrapper));
     product_string = ConvertJavaStringToUTF16(
         env, Java_ChromeUsbDevice_getProductName(env, wrapper));
     serial_number = ConvertJavaStringToUTF16(
         env, Java_ChromeUsbDevice_getSerialNumber(env, wrapper));
   }
   return make_scoped_refptr(new UsbDeviceAndroid(
       env, service,
       0x0200,  // USB protocol version, not provided by the Android API.
       Java_ChromeUsbDevice_getDeviceClass(env, wrapper),
       Java_ChromeUsbDevice_getDeviceSubclass(env, wrapper),
       Java_ChromeUsbDevice_getDeviceProtocol(env, wrapper),
       Java_ChromeUsbDevice_getVendorId(env, wrapper),
       Java_ChromeUsbDevice_getProductId(env, wrapper), device_version,
-      manufacturer_string, product_string, serial_number, blocking_task_runner,
-      wrapper));
+      manufacturer_string, product_string, serial_number, wrapper));
 }
 
 void UsbDeviceAndroid::RequestPermission(const ResultCallback& callback) {
   if (!permission_granted_ && service_) {
     request_permission_callbacks_.push_back(callback);
     service_->RequestDevicePermission(j_object_, device_id_);
   } else {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(callback, permission_granted_));
   }
 }
 
 void UsbDeviceAndroid::Open(const OpenCallback& callback) {
   scoped_refptr<UsbDeviceHandle> device_handle;
   if (service_) {
     JNIEnv* env = base::android::AttachCurrentThread();
     ScopedJavaLocalRef<jobject> connection =
         service_->OpenDevice(env, j_object_);
     if (!connection.is_null()) {
-      device_handle = UsbDeviceHandleAndroid::Create(
-          env, this, blocking_task_runner_, connection);
+      device_handle = UsbDeviceHandleAndroid::Create(env, this, connection);
       handles().push_back(device_handle.get());
     }
   }
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(callback, device_handle));
 }
 
 bool UsbDeviceAndroid::permission_granted() const {
   return permission_granted_;
 }
 
 UsbDeviceAndroid::UsbDeviceAndroid(
     JNIEnv* env,
     base::WeakPtr<UsbServiceAndroid> service,
     uint16_t usb_version,
     uint8_t device_class,
     uint8_t device_subclass,
     uint8_t device_protocol,
     uint16_t vendor_id,
     uint16_t product_id,
     uint16_t device_version,
     const base::string16& manufacturer_string,
     const base::string16& product_string,
     const base::string16& serial_number,
-    scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
     const JavaRef<jobject>& wrapper)
     : UsbDevice(usb_version,
                 device_class,
                 device_subclass,
                 device_protocol,
                 vendor_id,
                 product_id,
                 device_version,
                 manufacturer_string,
                 product_string,
                 serial_number),
-      blocking_task_runner_(blocking_task_runner),
       device_id_(Java_ChromeUsbDevice_getDeviceId(env, wrapper)),
       service_(service),
       j_object_(wrapper) {
   if (base::android::BuildInfo::GetInstance()->sdk_int() >= 21) {
     ScopedJavaLocalRef<jobjectArray> configurations =
         Java_ChromeUsbDevice_getConfigurations(env, j_object_);
     jsize count = env->GetArrayLength(configurations.obj());
     descriptor_.configurations.reserve(count);
     for (jsize i = 0; i < count; ++i) {
       ScopedJavaLocalRef<jobject> config(
@@ skipping 81 matching lines @@
   if (allowed_origins)
     webusb_allowed_origins_ = std::move(allowed_origins);
   if (landing_page.is_valid())
     webusb_landing_page_ = landing_page;
 
   device_handle->Close();
   CallRequestPermissionCallbacks(true);
 }
 
 }  // namespace device