bluetooth: Rename device's GetName to GetNameForDisplay

content/browser/bluetooth/bluetooth_device_chooser_controller.cc

 // Copyright 2016 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 "content/browser/bluetooth/bluetooth_device_chooser_controller.h"
 
 #include <set>
 #include <string>
 #include <unordered_set>
 
@@ skipping 83 matching lines @@
   return filters.empty()
              ? true
              : filters.end() != std::find_if(filters.begin(), filters.end(),
                                              IsEmptyOrInvalidFilter);
 }
 
 bool MatchesFilter(const device::BluetoothDevice& device,
                    const blink::mojom::WebBluetoothScanFilterPtr& filter) {
   DCHECK(!IsEmptyOrInvalidFilter(filter));
 
-  const std::string device_name = base::UTF16ToUTF8(device.GetName());
+  // TODO(615720): Use the upcoming GetName (was GetDeviceName).
+  const std::string device_name = base::UTF16ToUTF8(device.GetNameForDisplay());
 
   if (!filter->name.is_null() && (device_name != filter->name)) {
     return false;
   }
 
   if (!filter->name_prefix.is_null() &&
       (!base::StartsWith(device_name, filter->name_prefix.get(),
                          base::CompareCase::SENSITIVE))) {
     return false;
   }
@@ skipping 229 matching lines @@
     return;
   }
 
   StartDeviceDiscovery();
 }
 
 void BluetoothDeviceChooserController::AddFilteredDevice(
     const device::BluetoothDevice& device) {
   if (chooser_.get() && MatchesFilters(device, options_->filters)) {
     VLOG(1) << "Adding device to chooser: " << device.GetAddress();
-    chooser_->AddDevice(device.GetAddress(), device.GetName());
+    chooser_->AddDevice(device.GetAddress(), device.GetNameForDisplay());
   }
 }
 
 void BluetoothDeviceChooserController::AdapterPoweredChanged(bool powered) {
   if (!powered && discovery_session_.get()) {
     StopDiscoverySession(std::move(discovery_session_));
   }
 
   if (chooser_.get()) {
     chooser_->SetAdapterPresence(
@@ skipping 109 matching lines @@
 
 void BluetoothDeviceChooserController::PostErrorCallback(
     blink::mojom::WebBluetoothError error) {
   if (!base::ThreadTaskRunnerHandle::Get()->PostTask(
           FROM_HERE, base::Bind(error_callback_, error))) {
     LOG(WARNING) << "No TaskRunner.";
   }
 }
 
 }  // namespace content