bluetooth: Rename device's GetName to GetNameForDisplay

device/bluetooth/test/mock_bluetooth_device.h

Index: device/bluetooth/test/mock_bluetooth_device.h
diff --git a/device/bluetooth/test/mock_bluetooth_device.h b/device/bluetooth/test/mock_bluetooth_device.h
index c07a17f0b7b8f4747ff724d29d0d446ea591e996..4724d817ade792a247dc2eadcc7b11e526f262f0 100644
--- a/device/bluetooth/test/mock_bluetooth_device.h
+++ b/device/bluetooth/test/mock_bluetooth_device.h
@@ -33,16 +33,15 @@ class MockBluetoothDevice : public BluetoothDevice {
   virtual ~MockBluetoothDevice();
 
   MOCK_CONST_METHOD0(GetBluetoothClass, uint32_t());
-  MOCK_CONST_METHOD0(GetDeviceName, std::string());
   MOCK_CONST_METHOD0(GetIdentifier, std::string());
   MOCK_CONST_METHOD0(GetAddress, std::string());
   MOCK_CONST_METHOD0(GetVendorIDSource, BluetoothDevice::VendorIDSource());
   MOCK_CONST_METHOD0(GetVendorID, uint16_t());
   MOCK_CONST_METHOD0(GetProductID, uint16_t());
   MOCK_CONST_METHOD0(GetDeviceID, uint16_t());
-  MOCK_CONST_METHOD0(GetName, base::string16());
-  MOCK_CONST_METHOD0(GetDeviceType, BluetoothDevice::DeviceType());
   MOCK_CONST_METHOD0(GetAppearance, uint16_t());
+  MOCK_CONST_METHOD0(GetNameForDisplay, base::string16());
+  MOCK_CONST_METHOD0(GetDeviceType, BluetoothDevice::DeviceType());
   MOCK_CONST_METHOD0(IsPaired, bool());
   MOCK_CONST_METHOD0(IsConnected, bool());
   MOCK_CONST_METHOD0(IsGattConnected, bool());
@@ -95,6 +94,7 @@ class MockBluetoothDevice : public BluetoothDevice {
                      std::vector<BluetoothRemoteGattService*>());
   MOCK_CONST_METHOD1(GetGattService,
                      BluetoothRemoteGattService*(const std::string&));
+  MOCK_CONST_METHOD0(GetDeviceName, std::string());
   MOCK_METHOD0(CreateGattConnectionImpl, void());
   MOCK_METHOD0(DisconnectGatt, void());