bluetooth: Check if device name is null before trying to convert

device/bluetooth/bluetooth_device_unittest.cc

 // Copyright 2014 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 <stddef.h>
 
 #include "base/macros.h"
 #include "base/run_loop.h"
@@ skipping 97 matching lines @@
   }
   InitWithFakeAdapter();
   StartLowEnergyDiscoverySession();
   BluetoothDevice* device = DiscoverLowEnergyDevice(3);
   ASSERT_TRUE(device);
   BluetoothDevice::UUIDList uuids = device->GetUUIDs();
   EXPECT_EQ(0u, uuids.size());
 }
 #endif  // defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN)
 
+#if defined(OS_ANDROID)
+// GetDeviceName for Device with name.
+TEST_F(BluetoothTest, GetDeviceName) {
+  if (!PlatformSupportsLowEnergy()) {
+    LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test.";
+    return;
+  }
+  InitWithFakeAdapter();
+  StartLowEnergyDiscoverySession();
+  BluetoothDevice* device = DiscoverLowEnergyDevice(1);
+  EXPECT_EQ("FakeBluetoothDevice", device->GetDeviceName());

[scheib, 2016/04/11 17:58:12]

We already have LowEnergyDeviceProperties that tests GetName with a non-empty
value.

[ortuno, 2016/04/11 18:11:58]

Removed the test. Should I add a call to GetDeviceName in the
LowEnergyDeviceProperties test?

+}
+#endif  // defined(OS_ANDROID)
+
+#if defined(OS_ANDROID)
+// GetDeviceName for Device with no name.
+TEST_F(BluetoothTest, GetDeviceName_NullName) {
+  if (!PlatformSupportsLowEnergy()) {
+    LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test.";
+    return;
+  }
+  InitWithFakeAdapter();
+  StartLowEnergyDiscoverySession();
+  BluetoothDevice* device = DiscoverLowEnergyDevice(5);

[scheib, 2016/04/11 17:58:12]

Document '5' in bluetooth/test/bluetooth_test.h

[ortuno, 2016/04/11 18:11:58]

Done.

+  EXPECT_EQ("", device->GetDeviceName());
+}
+#endif  // defined(OS_ANDROID)
+
 // TODO(scheib): Test with a device with no name. http://crbug.com/506415
 // BluetoothDevice::GetAddressWithLocalizedDeviceTypeName() will run, which
 // requires string resources to be loaded. For that, something like
 // InitSharedInstance must be run. See unittest files that call that. It will
 // also require build configuration to generate string resources into a .pak
 // file.
 
 #if defined(OS_ANDROID) || defined(OS_MACOSX)
 // Basic CreateGattConnection test.
 TEST_F(BluetoothTest, CreateGattConnection) {
@@ skipping 469 matching lines @@
   ResetEventCounts();
   SimulateGattConnection(device);
   EXPECT_EQ(1, gatt_discovery_attempts_);
 
   SimulateGattServicesDiscoveryError(device);
   EXPECT_EQ(0u, device->GetGattServices().size());
 }
 #endif  // defined(OS_ANDROID)
 
 }  // namespace device