cros: Eliminate bluetooth methods from SystemTrayDelegate

ash/common/system/tray/system_tray_delegate.h

Index: ash/common/system/tray/system_tray_delegate.h
diff --git a/ash/common/system/tray/system_tray_delegate.h b/ash/common/system/tray/system_tray_delegate.h
index c6d2d066e931f8ec2841c6a8cc42a0ef902184e5..8ca219074ed5e7185eae2881e0b7d87a97a40560 100644
--- a/ash/common/system/tray/system_tray_delegate.h
+++ b/ash/common/system/tray/system_tray_delegate.h
@@ -21,10 +21,6 @@ class TimeDelta;
 class TimeTicks;
 }
 
-namespace device {
-enum class BluetoothDeviceType;
-}
-
 namespace ash {
 struct IMEInfo;
 struct IMEPropertyInfo;
@@ -36,23 +32,6 @@ class SystemTrayItem;
 using IMEInfoList = std::vector<IMEInfo>;
 using IMEPropertyInfoList = std::vector<IMEPropertyInfo>;
 
-// TODO(jamescook): Convert TrayBlueooth to use device::BluetoothDevice and
-// delete this. http://crbug.com/660043
-struct ASH_EXPORT BluetoothDeviceInfo {
-  BluetoothDeviceInfo();
-  BluetoothDeviceInfo(const BluetoothDeviceInfo& other);
-  ~BluetoothDeviceInfo();
-
-  std::string address;
-  base::string16 display_name;
-  bool connected;
-  bool connecting;
-  bool paired;
-  device::BluetoothDeviceType device_type;
-};
-
-using BluetoothDeviceList = std::vector<BluetoothDeviceInfo>;
-
 class NetworkingConfigDelegate;
 
 // SystemTrayDelegate is intended for delegating tasks in the System Tray to the
@@ -119,21 +98,6 @@ class ASH_EXPORT SystemTrayDelegate {
   // Shows login UI to add other users to this session.
   virtual void ShowUserLogin();
 
-  // Returns a list of available bluetooth devices.
-  virtual void GetAvailableBluetoothDevices(BluetoothDeviceList* devices);
-
-  // Requests bluetooth start discovering devices.
-  virtual void BluetoothStartDiscovering();
-
-  // Requests bluetooth stop discovering devices.
-  virtual void BluetoothStopDiscovering();
-
-  // Connect to a specific bluetooth device.
-  virtual void ConnectToBluetoothDevice(const std::string& address);
-
-  // Returns true if bluetooth adapter is discovering bluetooth devices.
-  virtual bool IsBluetoothDiscovering() const;
-
   // Returns the currently selected IME.
   virtual void GetCurrentIME(IMEInfo* info);
 
@@ -152,18 +116,6 @@ class ASH_EXPORT SystemTrayDelegate {
   // Activates an IME property.
   virtual void ActivateIMEProperty(const std::string& key);
 
-  // Toggles bluetooth.
-  virtual void ToggleBluetooth();
-
-  // Returns whether bluetooth capability is available.
-  virtual bool GetBluetoothAvailable();
-
-  // Returns whether bluetooth is enabled.
-  virtual bool GetBluetoothEnabled();
-
-  // Returns whether the delegate has initiated a bluetooth discovery session.
-  virtual bool GetBluetoothDiscovering();
-
   // Returns NetworkingConfigDelegate. May return nullptr.
   virtual NetworkingConfigDelegate* GetNetworkingConfigDelegate() const;