bluetooth: Rename device's GetName to GetNameForDisplay

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 26 matching lines @@
       max_transmit_power(kUnknownPower) {}
 
 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::GetName() const {
+base::string16 BluetoothDevice::GetNameForDisplay() const {
   std::string name = GetDeviceName();
   if (!name.empty()) {
     return base::UTF8ToUTF16(name);
   } else {
     return GetAddressWithLocalizedDeviceTypeName();
   }
 }
 
 base::string16 BluetoothDevice::GetAddressWithLocalizedDeviceTypeName() const {
   base::string16 address_utf16 = base::UTF8ToUTF16(GetAddress());
@@ skipping 327 matching lines @@
                       base::BinaryValue::CreateWithCopiedBuffer(buffer, size));
 }
 
 void BluetoothDevice::Pair(PairingDelegate* pairing_delegate,
                            const base::Closure& callback,
                            const ConnectErrorCallback& error_callback) {
   NOTREACHED();
 }
 
 }  // namespace device