Don't improve Bluetooth Adapter name on Linux

device/bluetooth/bluetooth_adapter_bluez.cc

Index: device/bluetooth/bluetooth_adapter_bluez.cc
diff --git a/device/bluetooth/bluetooth_adapter_bluez.cc b/device/bluetooth/bluetooth_adapter_bluez.cc
index f8df754c95e63d82b24ff673b6912d200292cbe6..5d3fdea53569874d3da876b79c87486def3f4eb2 100644
--- a/device/bluetooth/bluetooth_adapter_bluez.cc
+++ b/device/bluetooth/bluetooth_adapter_bluez.cc
@@ -828,10 +828,6 @@ void BluetoothAdapterBlueZ::SetDefaultAdapterName() {
       alias = "Chromebook";
       break;
   }
-#elif defined(OS_LINUX)
-  alias = "ChromeLinux";
-#endif
-
   // Take the lower 2 bytes of hashed Bluetooth address and combine it with the
   // device type to create a more identifiable device name.
   const std::string address = GetAddress();
@@ -839,6 +835,9 @@ void BluetoothAdapterBlueZ::SetDefaultAdapterName() {
       "%s_%04X", alias.c_str(),
       base::SuperFastHash(address.data(), address.size()) & 0xFFFF);
   SetName(alias, base::Bind(&base::DoNothing), base::Bind(&base::DoNothing));
+#elif defined(OS_LINUX)

[ortuno, 2016/03/30 17:11:57]

You are moving this after "SetName" so you might as well just remove the linux
part.

That said I don't think this is the right solution. I think we need to do two
things:

  1. There is no reason for chrome to change the adapter's name on Linux so we
shouldn't even call SetDefaultAdapterName on Linux. To do this add #if
defined(OS_CHROME) to [1].
  2. I think a little refactoring is needed here. The name
"SetDefaultAdapterName" is misleading. I would rename it to
SetStandardChromeOSAdapterName, remove the #if defined(OS_LINUX) and make the
function only available on Chrome OS.

[1]
https://code.google.com/p/chromium/codesearch#chromium/src/device/bluetooth/b...
[2] http://git.kernel.org/cgit/bluetooth/bluez.git/tree/doc/adapter-api.txt#n120

+  alias = "ChromeLinux";
+#endif
 }
 
 void BluetoothAdapterBlueZ::RemoveAdapter() {