Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(354)

Unified Diff: device/bluetooth/bluetooth_device_win_unittest.cc

Issue 2009753002: bluetooth: Make public BluetoothDevice::GetName method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: split out name/alias Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/bluetooth/bluetooth_device_win.cc ('k') | device/bluetooth/bluetooth_low_energy_device_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_device_win_unittest.cc
diff --git a/device/bluetooth/bluetooth_device_win_unittest.cc b/device/bluetooth/bluetooth_device_win_unittest.cc
index 53d581687651a926d86a325d8511756542bf6f40..5e6bd24ed549c66e9eab1bcf24a55290ebde799d 100644
--- a/device/bluetooth/bluetooth_device_win_unittest.cc
+++ b/device/bluetooth/bluetooth_device_win_unittest.cc
@@ -49,7 +49,7 @@ class BluetoothDeviceWinTest : public testing::Test {
// Add device with audio/video services.
device_state_.reset(new BluetoothTaskManagerWin::DeviceState());
- device_state_->name = kDeviceName;
+ device_state_->name = std::string(kDeviceName);
device_state_->address = kDeviceAddress;
BluetoothTaskManagerWin::ServiceRecordState* audio_state =
@@ -70,7 +70,7 @@ class BluetoothDeviceWinTest : public testing::Test {
// Add empty device.
empty_device_state_.reset(new BluetoothTaskManagerWin::DeviceState());
- empty_device_state_->name = kDeviceName;
+ empty_device_state_->name = std::string(kDeviceName);
empty_device_state_->address = kDeviceAddress;
empty_device_.reset(new BluetoothDeviceWin(NULL, *empty_device_state_,
ui_task_runner, socket_thread,
« no previous file with comments | « device/bluetooth/bluetooth_device_win.cc ('k') | device/bluetooth/bluetooth_low_energy_device_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698