bluetooth: Add optional 'name' support to MockBluetoothDevice.

device/bluetooth/test/mock_bluetooth_device.cc

Index: device/bluetooth/test/mock_bluetooth_device.cc
diff --git a/device/bluetooth/test/mock_bluetooth_device.cc b/device/bluetooth/test/mock_bluetooth_device.cc
index 891c9cf803b8952193acf414a02dd1eb5bda2deb..39d27c82c606a4f1fd1079d85a96dff6daacf587 100644
--- a/device/bluetooth/test/mock_bluetooth_device.cc
+++ b/device/bluetooth/test/mock_bluetooth_device.cc
@@ -15,13 +15,13 @@ namespace device {
 
 MockBluetoothDevice::MockBluetoothDevice(MockBluetoothAdapter* adapter,
                                          uint32_t bluetooth_class,
-                                         const std::string& name,
+                                         const char* name,
                                          const std::string& address,
                                          bool paired,
                                          bool connected)
     : BluetoothDevice(adapter),
       bluetooth_class_(bluetooth_class),
-      name_(name),
+      name_(name ? base::Optional<std::string>(name) : base::nullopt),
       address_(address),
       connected_(connected) {
   ON_CALL(*this, GetBluetoothClass())
@@ -38,10 +38,10 @@ MockBluetoothDevice::MockBluetoothDevice(MockBluetoothAdapter* adapter,
       .WillByDefault(testing::Return(0));
   ON_CALL(*this, GetDeviceID())
       .WillByDefault(testing::Return(0));
-  ON_CALL(*this, GetName())
-      .WillByDefault(testing::Return(base::make_optional(name_)));
+  ON_CALL(*this, GetName()).WillByDefault(testing::Return(name_));
   ON_CALL(*this, GetNameForDisplay())
-      .WillByDefault(testing::Return(base::UTF8ToUTF16(name_)));
+      .WillByDefault(testing::Return(
+          base::UTF8ToUTF16(name_ ? name_.value() : "Unnamed Device")));
   ON_CALL(*this, GetDeviceType())
       .WillByDefault(testing::Return(DEVICE_UNKNOWN));
   ON_CALL(*this, IsPaired())