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 806 matching lines @@
   VLOG(1) << "Registering pairing agent";
   bluez::BluezDBusManager::Get()
       ->GetBluetoothAgentManagerClient()
       ->RegisterAgent(dbus::ObjectPath(kAgentPath),
                       bluetooth_agent_manager::kKeyboardDisplayCapability,
                       base::Bind(&BluetoothAdapterBlueZ::OnRegisterAgent,
                                  weak_ptr_factory_.GetWeakPtr()),
                       base::Bind(&BluetoothAdapterBlueZ::OnRegisterAgentError,
                                  weak_ptr_factory_.GetWeakPtr()));
 
-  SetDefaultAdapterName();
+#if defined(OS_CHROMEOS)
+  SetStandardChromeOSAdapterName();
+#endif
 
   bluez::BluetoothAdapterClient::Properties* properties =
       bluez::BluezDBusManager::Get()
           ->GetBluetoothAdapterClient()
           ->GetProperties(object_path_);
 
   PresentChanged(true);
 
   if (properties->powered.value())
     PoweredChanged(true);
   if (properties->discoverable.value())
     DiscoverableChanged(true);
   if (properties->discovering.value())
     DiscoveringChanged(true);
 
   std::vector<dbus::ObjectPath> device_paths =
       bluez::BluezDBusManager::Get()
           ->GetBluetoothDeviceClient()
           ->GetDevicesForAdapter(object_path_);
 
   for (std::vector<dbus::ObjectPath>::iterator iter = device_paths.begin();
        iter != device_paths.end(); ++iter) {
     DeviceAdded(*iter);
   }
 }
 
-void BluetoothAdapterBlueZ::SetDefaultAdapterName() {
+#if defined(OS_CHROMEOS)
+void BluetoothAdapterBlueZ::SetStandardChromeOSAdapterName() {
   DCHECK(IsPresent());
 
   std::string alias;
-#if defined(OS_CHROMEOS)
   switch (chromeos::GetDeviceType()) {
     case chromeos::DeviceType::kChromebase:
       alias = "Chromebase";
       break;
     case chromeos::DeviceType::kChromebit:
       alias = "Chromebit";
       break;
     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));
 }
+#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 551 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