Remove now-unnecessary .obj() in Java method calls.

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"
@@ skipping 12 matching lines @@
 
 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.obj());
+      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.obj());
+    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.obj()));
+        env, Java_ChromeUsbDevice_getManufacturerName(env, wrapper));
     product_string = ConvertJavaStringToUTF16(
-        env, Java_ChromeUsbDevice_getProductName(env, wrapper.obj()));
+        env, Java_ChromeUsbDevice_getProductName(env, wrapper));
     serial_number = ConvertJavaStringToUTF16(
-        env, Java_ChromeUsbDevice_getSerialNumber(env, wrapper.obj()));
+        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.obj()),
-      Java_ChromeUsbDevice_getDeviceSubclass(env, wrapper.obj()),
-      Java_ChromeUsbDevice_getDeviceProtocol(env, wrapper.obj()),
-      Java_ChromeUsbDevice_getVendorId(env, wrapper.obj()),
-      Java_ChromeUsbDevice_getProductId(env, wrapper.obj()), device_version,
+      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));
 }
 
 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(
@@ skipping 40 matching lines @@
                 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.obj())),
+      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_.obj());
+        Java_ChromeUsbDevice_getConfigurations(env, j_object_);
     jsize count = env->GetArrayLength(configurations.obj());
     configurations_.reserve(count);
     for (jsize i = 0; i < count; ++i) {
       ScopedJavaLocalRef<jobject> config(
           env, env->GetObjectArrayElement(configurations.obj(), i));
       configurations_.push_back(UsbConfigurationAndroid::Convert(env, config));
     }
   } else {
     // Pre-lollipop only the first configuration was supported. Build a basic
     // configuration out of the available interfaces.
     UsbConfigDescriptor config(1,      // Configuration value, reasonable guess.
                                false,  // Self powered, arbitrary default.
                                false,  // Remote wakeup, rbitrary default.
                                0);     // Maximum power, aitrary default.
 
     ScopedJavaLocalRef<jobjectArray> interfaces =
-        Java_ChromeUsbDevice_getInterfaces(env, wrapper.obj());
+        Java_ChromeUsbDevice_getInterfaces(env, wrapper);
     jsize count = env->GetArrayLength(interfaces.obj());
     config.interfaces.reserve(count);
     for (jsize i = 0; i < count; ++i) {
       ScopedJavaLocalRef<jobject> interface(
           env, env->GetObjectArrayElement(interfaces.obj(), i));
       config.interfaces.push_back(UsbInterfaceAndroid::Convert(env, interface));
     }
     configurations_.push_back(config);
   }
 }
@@ skipping 56 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