bluetooth: Make public BluetoothDevice::GetName method.

extensions/browser/api/bluetooth/bluetooth_apitest.cc

 // 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.
 
 #include <string.h>
 
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
@@ skipping 137 matching lines @@
   ResultCatcher catcher;
   catcher.RestrictToBrowserContext(browser()->profile());
 
   ASSERT_TRUE(LoadExtension(
         test_data_dir_.AppendASCII("bluetooth/device_events")));
 
   ExtensionTestMessageListener events_received("ready", true);
   event_router()->DeviceAdded(mock_adapter_, device1_.get());
   event_router()->DeviceAdded(mock_adapter_, device2_.get());
 
-  EXPECT_CALL(*device2_, GetDeviceName())
-      .WillRepeatedly(testing::Return("the real d2"));
+  EXPECT_CALL(*device2_, GetName())
+      .WillRepeatedly(
+          testing::Return(base::Optional<std::string>("the real d2")));
   EXPECT_CALL(*device2_, GetNameForDisplay())
       .WillRepeatedly(testing::Return(base::UTF8ToUTF16("the real d2")));
   event_router()->DeviceChanged(mock_adapter_, device2_.get());
 
   event_router()->DeviceAdded(mock_adapter_, device3_.get());
   event_router()->DeviceRemoved(mock_adapter_, device1_.get());
   EXPECT_TRUE(events_received.WaitUntilSatisfied());
   events_received.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
@@ skipping 235 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(BluetoothApiTest, DeviceInfo) {
   ResultCatcher catcher;
   catcher.RestrictToBrowserContext(browser()->profile());
 
   // Set up the first device object to reflect a real-world device.
   BluetoothAdapter::ConstDeviceList devices;
 
   EXPECT_CALL(*device1_, GetAddress())
       .WillRepeatedly(testing::Return("A4:17:31:00:00:00"));
-  EXPECT_CALL(*device1_, GetDeviceName())
-      .WillRepeatedly(testing::Return("Chromebook Pixel"));
+  EXPECT_CALL(*device1_, GetName())
+      .WillRepeatedly(
+          testing::Return(base::Optional<std::string>("Chromebook Pixel")));
   EXPECT_CALL(*device1_, GetNameForDisplay())
       .WillRepeatedly(testing::Return(base::UTF8ToUTF16("Chromebook Pixel")));
   EXPECT_CALL(*device1_, GetBluetoothClass())
       .WillRepeatedly(testing::Return(0x080104));
   EXPECT_CALL(*device1_, GetDeviceType())
       .WillRepeatedly(testing::Return(BluetoothDevice::DEVICE_COMPUTER));
   EXPECT_CALL(*device1_, GetVendorIDSource())
       .WillRepeatedly(testing::Return(BluetoothDevice::VENDOR_ID_BLUETOOTH));
   EXPECT_CALL(*device1_, GetVendorID()).WillRepeatedly(testing::Return(0x00E0));
   EXPECT_CALL(*device1_, GetProductID())
@@ skipping 19 matching lines @@
   // Load and wait for setup
   ExtensionTestMessageListener listener("ready", true);
   ASSERT_TRUE(
       LoadExtension(test_data_dir_.AppendASCII("bluetooth/device_info")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }