bluetooth: Make public BluetoothDevice::GetName method.

device/bluetooth/bluetooth_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/bluetooth/bluetooth_device_android.h"
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ skipping 85 matching lines @@
   return 0;
 }
 
 uint16_t BluetoothDeviceAndroid::GetAppearance() const {
   // TODO(crbug.com/588083): Implementing GetAppearance()
   // on mac, win, and android platforms for chrome
   NOTIMPLEMENTED();
   return 0;
 }
 
+base::Optional<std::string> BluetoothDeviceAndroid::GetName() const {
+  auto name = Java_ChromeBluetoothDevice_getName(AttachCurrentThread(),
+                                                 j_device_.obj());
+  if (name.is_null())
+    return base::nullopt;
+  return ConvertJavaStringToUTF8(name);
+}
+
 bool BluetoothDeviceAndroid::IsPaired() const {
   return Java_ChromeBluetoothDevice_isPaired(AttachCurrentThread(),
                                              j_device_.obj());
 }
 
 bool BluetoothDeviceAndroid::IsConnected() const {
   return IsGattConnected();
 }
 
 bool BluetoothDeviceAndroid::IsGattConnected() const {
@@ skipping 157 matching lines @@
           BluetoothRemoteGattServiceAndroid::Create(
               GetAndroidAdapter(), this, bluetooth_gatt_service_wrapper,
               instance_id_string, j_device_.obj()));
 
   adapter_->NotifyGattServiceAdded(service_iterator->second);
 }
 
 BluetoothDeviceAndroid::BluetoothDeviceAndroid(BluetoothAdapterAndroid* adapter)
     : BluetoothDevice(adapter) {}
 
-std::string BluetoothDeviceAndroid::GetDeviceName() const {
-  auto device_name = Java_ChromeBluetoothDevice_getDeviceName(
-      AttachCurrentThread(), j_device_.obj());
-
-  if (device_name.is_null()) {
-    return "";
-  }
-  return ConvertJavaStringToUTF8(device_name);
-}
-
 void BluetoothDeviceAndroid::CreateGattConnectionImpl() {
   Java_ChromeBluetoothDevice_createGattConnectionImpl(
       AttachCurrentThread(), j_device_.obj(),
       base::android::GetApplicationContext());
 }
 
 void BluetoothDeviceAndroid::DisconnectGatt() {
   Java_ChromeBluetoothDevice_disconnectGatt(AttachCurrentThread(),
                                             j_device_.obj());
 }
 
 }  // namespace device