bluetooth: Rename device's GetName to GetNameForDisplay

device/bluetooth/test/mock_bluetooth_device.h

 // 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.
 
 #ifndef DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_DEVICE_H_
 #define DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_DEVICE_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 15 matching lines @@
  public:
   MockBluetoothDevice(MockBluetoothAdapter* adapter,
                       uint32_t bluetooth_class,
                       const std::string& name,
                       const std::string& address,
                       bool paired,
                       bool connected);
   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(GetAppearance, uint16_t());
+  MOCK_CONST_METHOD0(GetNameForDisplay, base::string16());
   MOCK_CONST_METHOD0(GetDeviceType, BluetoothDevice::DeviceType());
-  MOCK_CONST_METHOD0(GetAppearance, uint16_t());
   MOCK_CONST_METHOD0(IsPaired, bool());
   MOCK_CONST_METHOD0(IsConnected, bool());
   MOCK_CONST_METHOD0(IsGattConnected, bool());
   MOCK_CONST_METHOD0(IsConnectable, bool());
   MOCK_CONST_METHOD0(IsConnecting, bool());
   MOCK_CONST_METHOD0(GetUUIDs, UUIDList());
   MOCK_CONST_METHOD0(GetInquiryRSSI, int16_t());
   MOCK_CONST_METHOD0(GetInquiryTxPower, int16_t());
   MOCK_CONST_METHOD0(ExpectingPinCode, bool());
   MOCK_CONST_METHOD0(ExpectingPasskey, bool());
@@ skipping 32 matching lines @@
                void(const GattConnectionCallback& callback,
                     const ConnectErrorCallback& error_callback));
 
   MOCK_METHOD1(SetGattServicesDiscoveryComplete, void(bool));
   MOCK_CONST_METHOD0(IsGattServicesDiscoveryComplete, bool());
 
   MOCK_CONST_METHOD0(GetGattServices,
                      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());
 
   // BluetoothDevice manages the lifetime of its BluetoothGATTServices.
   // This method takes ownership of the MockBluetoothGATTServices. This is only
   // for convenience as far as testing is concerned, and it's possible to write
   // test cases without using these functions.
   // Example:
   // ON_CALL(*mock_device, GetGattServices))
   //   .WillByDefault(Invoke(*mock_device,
@@ skipping 11 matching lines @@
   std::string address_;
   BluetoothDevice::UUIDList uuids_;
   bool connected_;
 
   ScopedVector<MockBluetoothGattService> mock_services_;
 };
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_DEVICE_H_