bluetooth: Rename device's GetName to GetNameForDisplay

ash/system/chromeos/bluetooth/bluetooth_notification_controller.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 "ash/system/chromeos/bluetooth/bluetooth_notification_controller.h"
 
 #include <memory>
 #include <utility>
 
 #include "ash/system/system_notifier.h"
@@ skipping 186 matching lines @@
   // Cannot provide keyboard entry in a notification; fortunately the spec
   // doesn't allow for this to be an option when we're receiving the pairing
   // request anyway.
   device->CancelPairing();
 }
 
 void BluetoothNotificationController::DisplayPinCode(
     BluetoothDevice* device,
     const std::string& pincode) {
   base::string16 message = l10n_util::GetStringFUTF16(
-          IDS_ASH_STATUS_TRAY_BLUETOOTH_DISPLAY_PINCODE,
-          device->GetName(), base::UTF8ToUTF16(pincode));
+      IDS_ASH_STATUS_TRAY_BLUETOOTH_DISPLAY_PINCODE,
+      device->GetNameForDisplay(), base::UTF8ToUTF16(pincode));
 
   NotifyPairing(device, message, false);
 }
 
 void BluetoothNotificationController::DisplayPasskey(BluetoothDevice* device,
                                                      uint32_t passkey) {
   base::string16 message = l10n_util::GetStringFUTF16(
-          IDS_ASH_STATUS_TRAY_BLUETOOTH_DISPLAY_PASSKEY,
-          device->GetName(), base::UTF8ToUTF16(
-              base::StringPrintf("%06i", passkey)));
+      IDS_ASH_STATUS_TRAY_BLUETOOTH_DISPLAY_PASSKEY,
+      device->GetNameForDisplay(),
+      base::UTF8ToUTF16(base::StringPrintf("%06i", passkey)));
 
   NotifyPairing(device, message, false);
 }
 
 void BluetoothNotificationController::KeysEntered(BluetoothDevice* device,
                                                   uint32_t entered) {
   // Ignored since we don't have CSS in the notification to update.
 }
 
 void BluetoothNotificationController::ConfirmPasskey(BluetoothDevice* device,
                                                      uint32_t passkey) {
   base::string16 message = l10n_util::GetStringFUTF16(
-          IDS_ASH_STATUS_TRAY_BLUETOOTH_CONFIRM_PASSKEY,
-          device->GetName(), base::UTF8ToUTF16(
-              base::StringPrintf("%06i", passkey)));
+      IDS_ASH_STATUS_TRAY_BLUETOOTH_CONFIRM_PASSKEY,
+      device->GetNameForDisplay(),
+      base::UTF8ToUTF16(base::StringPrintf("%06i", passkey)));
 
   NotifyPairing(device, message, true);
 }
 
 void BluetoothNotificationController::AuthorizePairing(
     BluetoothDevice* device) {
   base::string16 message = l10n_util::GetStringFUTF16(
-          IDS_ASH_STATUS_TRAY_BLUETOOTH_AUTHORIZE_PAIRING,
-          device->GetName());
+      IDS_ASH_STATUS_TRAY_BLUETOOTH_AUTHORIZE_PAIRING,
+      device->GetNameForDisplay());
 
   NotifyPairing(device, message, true);
 }
 
 
 void BluetoothNotificationController::OnGetAdapter(
     scoped_refptr<BluetoothAdapter> adapter) {
   DCHECK(!adapter_.get());
   adapter_ = adapter;
   adapter_->AddObserver(this);
@@ skipping 74 matching lines @@
       kBluetoothDevicePairingNotificationId, false /* by_user */);
 
   message_center::RichNotificationData optional;
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
 
   std::unique_ptr<Notification> notification(new Notification(
       message_center::NOTIFICATION_TYPE_SIMPLE,
       kBluetoothDevicePairedNotificationId, base::string16() /* title */,
       l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_BLUETOOTH_PAIRED,
-                                 device->GetName()),
+                                 device->GetNameForDisplay()),
       bundle.GetImageNamed(IDR_AURA_NOTIFICATION_BLUETOOTH),
       base::string16() /* display source */, GURL(),
       message_center::NotifierId(message_center::NotifierId::SYSTEM_COMPONENT,
                                  system_notifier::kNotifierBluetooth),
       optional, NULL));
   message_center::MessageCenter::Get()->AddNotification(
       std::move(notification));
 }
 
 }  // namespace ash