bluetooth: Make public BluetoothDevice::GetName method.

device/bluetooth/bluetooth_device.cc

 // Copyright (c) 2012 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.h"
 
 #include <memory>
 #include <string>
 
 #include "base/memory/ptr_util.h"
@@ skipping 29 matching lines @@
 
 BluetoothDevice::ConnectionInfo::ConnectionInfo(
     int rssi, int transmit_power, int max_transmit_power)
     : rssi(rssi),
       transmit_power(transmit_power),
       max_transmit_power(max_transmit_power) {}
 
 BluetoothDevice::ConnectionInfo::~ConnectionInfo() {}
 
 base::string16 BluetoothDevice::GetNameForDisplay() const {
-  std::string name = GetDeviceName();
-  if (!name.empty()) {
-    return base::UTF8ToUTF16(name);
+  base::Optional<std::string> name = GetName();
+  if (name && !name.value().empty()) {
+    return base::UTF8ToUTF16(name.value());
   } else {
     return GetAddressWithLocalizedDeviceTypeName();
   }
 }
 
 base::string16 BluetoothDevice::GetAddressWithLocalizedDeviceTypeName() const {
   base::string16 address_utf16 = base::UTF8ToUTF16(GetAddress());
   BluetoothDevice::DeviceType device_type = GetDeviceType();
   switch (device_type) {
     case DEVICE_COMPUTER:
@@ skipping 167 matching lines @@
     return false;
 
   // TODO: Move this database into a config file.
 
   return true;
 }
 
 bool BluetoothDevice::IsTrustable() const {
   // Sony PlayStation Dualshock3
   if ((GetVendorID() == 0x054c && GetProductID() == 0x0268 &&
-       GetDeviceName() == "PLAYSTATION(R)3 Controller"))
+       GetName() == std::string("PLAYSTATION(R)3 Controller")))
     return true;
 
   return false;
 }
 
 void BluetoothDevice::CreateGattConnection(
     const GattConnectionCallback& callback,
     const ConnectErrorCallback& error_callback) {
   create_gatt_connection_success_callbacks_.push_back(callback);
   create_gatt_connection_error_callbacks_.push_back(error_callback);
@@ skipping 146 matching lines @@
                            const base::Closure& callback,
                            const ConnectErrorCallback& error_callback) {
   NOTREACHED();
 }
 
 void BluetoothDevice::UpdateTimestamp() {
   last_update_time_ = base::Time::NowFromSystemTime();
 }
 
 }  // namespace device