Don't improve Bluetooth Adapter name on Linux

device/bluetooth/bluetooth_adapter_bluez.cc

 // Copyright 2013 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 "device/bluetooth/bluetooth_adapter_bluez.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 810 matching lines @@
     case chromeos::DeviceType::kChromebook:
       alias = "Chromebook";
       break;
     case chromeos::DeviceType::kChromebox:
       alias = "Chromebox";
       break;
     case chromeos::DeviceType::kUnknown:
       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();
   alias = base::StringPrintf(
       "%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() {
   DCHECK(IsPresent());
   VLOG(1) << object_path_.value() << ": adapter removed.";
 
   bluez::BluetoothAdapterClient::Properties* properties =
       bluez::BluezDBusManager::Get()
           ->GetBluetoothAdapterClient()
           ->GetProperties(object_path_);
@@ skipping 552 matching lines @@
 
     // If the queued request resulted in a pending call, then let it
     // asynchonously process the remaining queued requests once the pending
     // call returns.
     if (discovery_request_pending_)
       return;
   }
 }
 
 }  // namespace bluez