Replace kChromeOSReleaseBoard with SysInfo::GetLsbReleaseBoard()

device/bluetooth/bluetooth_adapter_chromeos.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_chromeos.h"
 
 #include <string>
 
 #include "base/bind.h"
-#include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
-#include "chromeos/chromeos_switches.h"
+#include "base/sys_info.h"
 #include "chromeos/dbus/bluetooth_adapter_client.h"
 #include "chromeos/dbus/bluetooth_device_client.h"
 #include "chromeos/dbus/bluetooth_input_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/bluetooth_device_chromeos.h"
 
 using device::BluetoothAdapter;
 using device::BluetoothDevice;
 
@@ skipping 297 matching lines @@
         new BluetoothDeviceChromeOS(this, *iter);
 
     devices_[device_chromeos->GetAddress()] = device_chromeos;
 
     FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
                       DeviceAdded(this, device_chromeos));
   }
 }
 
 void BluetoothAdapterChromeOS::SetAdapterName() {
-  // Set a better name for the adapter than "BlueZ 5.x"; this isn't an ideal
-  // way to do this but it'll do for now. See http://crbug.com/126732 and
-  // http://crbug.com/126802.
-  std::string board;
-  const CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(chromeos::switches::kChromeOSReleaseBoard)) {
-    board = command_line->
-        GetSwitchValueASCII(chromeos::switches::kChromeOSReleaseBoard);
-  }
-
+  std::string board = base::SysInfo::GetLsbReleaseBoard();
   std::string alias;
   if (board.substr(0, 6) == "stumpy") {
     alias = "Chromebox";
   } else if (board.substr(0, 4) == "link") {
     alias = "Chromebook Pixel";
   } else {
     alias = "Chromebook";
   }
 
   DBusThreadManager::Get()->GetBluetoothAdapterClient()->
@@ skipping 91 matching lines @@
 void BluetoothAdapterChromeOS::OnStopDiscoveryError(
     const ErrorCallback& error_callback,
     const std::string& error_name,
     const std::string& error_message) {
   LOG(WARNING) << object_path_.value() << ": Failed to stop discovery: "
                << error_name << ": " << error_message;
   error_callback.Run();
 }
 
 }  // namespace chromeos