Chromium Code Reviews| Index: chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.cc |
| diff --git a/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.cc b/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.cc |
| index 5bc0cf7a428e6affa7afb624a6572eb274ce2190..83245d5a3026ddb1a9abb3595d9a5706b87c9d62 100644 |
| --- a/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.cc |
| +++ b/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.cc |
| @@ -8,19 +8,17 @@ |
| namespace chromeos { |
| -MockBluetoothDevice::MockBluetoothDevice(MockBluetoothAdapter* adapter, |
| - const std::string& name, |
| - const std::string& address, |
| - bool paired, |
| - bool bonded, |
| - bool connected) |
| - : BluetoothDevice(adapter), |
| - name_(UTF8ToUTF16(name)), |
| - address_(address) { |
| +MockBluetoothDevice::MockBluetoothDevice( |
|
bryeung
2012/09/13 19:52:57
why did this get whitespace changes?
youngki
2012/09/17 21:53:02
Done.
|
| + MockBluetoothAdapter* adapter, |
| + const std::string& name, |
| + const std::string& address, |
| + bool paired, |
| + bool bonded, |
| + bool connected) { |
| ON_CALL(*this, GetName()) |
| - .WillByDefault(testing::Return(name_)); |
| + .WillByDefault(testing::Return(UTF8ToUTF16(name))); |
| ON_CALL(*this, address()) |
| - .WillByDefault(testing::ReturnRef(address_)); |
| + .WillByDefault(testing::ReturnRef(address)); |
| ON_CALL(*this, IsPaired()) |
| .WillByDefault(testing::Return(paired)); |
| ON_CALL(*this, IsBonded()) |