cros: Eliminate bluetooth methods from SystemTrayDelegate

ash/common/system/chromeos/bluetooth/tray_bluetooth_helper.h

 // Copyright 2017 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.
 
 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_BLUETOOTH_TRAY_BLUETOOTH_HELPER_H_
 #define ASH_COMMON_SYSTEM_CHROMEOS_BLUETOOTH_TRAY_BLUETOOTH_HELPER_H_
 
 #include <memory>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 
 namespace device {
 class BluetoothDiscoverySession;
 }
 
 namespace ash {
 
-struct BluetoothDeviceInfo;
+// 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>;
 
 // Maps UI concepts from the Bluetooth system tray (e.g. "Bluetooth is on") into
 // device concepts ("Bluetooth adapter enabled"). Note that most Bluetooth
 // device operations are asynchronous, hence the two step initialization.
 // Exported for test.
 class ASH_EXPORT TrayBluetoothHelper
     : public device::BluetoothAdapter::Observer {
  public:
   TrayBluetoothHelper();
   ~TrayBluetoothHelper() override;
 
   // Initializes and gets the adapter asynchronously.
   void Initialize();
 
   // Completes initialization after the Bluetooth adapter is ready.
   void InitializeOnAdapterReady(
       scoped_refptr<device::BluetoothAdapter> adapter);
 
   // Returns a list of available bluetooth devices.
   // TODO(jamescook): Just return the list.
-  void GetAvailableDevices(std::vector<BluetoothDeviceInfo>* list);
+  void GetAvailableBluetoothDevices(std::vector<BluetoothDeviceInfo>* list);

[James Cook, 2017/03/21 00:31:58]

I renamed all these to make the code in TrayBluetooth read better.

For example:
helper->IsDiscovering() was OK

but:
helper->GetEnabled() wasn't OK, sounded like the helper itself was enabled

So I renamed them all for consistency. Lemme know if you have other name
suggestions.

[msw, 2017/03/21 01:54:43]

I think your renaming is fine as-is.

 
   // Requests bluetooth start discovering devices, which happens asynchronously.
-  void StartDiscovering();
+  void StartBluetoothDiscovering();
 
   // Requests bluetooth stop discovering devices.
-  void StopDiscovering();
+  void StopBluetoothDiscovering();
 
   // Connect to a specific bluetooth device.
-  void ConnectToDevice(const std::string& address);
+  void ConnectToBluetoothDevice(const std::string& address);
 
   // Returns true if bluetooth adapter is discovering bluetooth devices.
-  bool IsDiscovering() const;
+  bool IsBluetoothDiscovering() const;
 
   // Toggles whether bluetooth is enabled.
-  void ToggleEnabled();
+  void ToggleBluetoothEnabled();
 
   // Returns whether bluetooth capability is available (e.g. the device has
   // hardware support).
-  bool GetAvailable();
+  bool GetBluetoothAvailable();
 
   // Returns whether bluetooth is enabled.
-  bool GetEnabled();
+  bool GetBluetoothEnabled();
 
   // Returns whether the delegate has initiated a bluetooth discovery session.
   // TODO(jamescook): Why do we need both this and IsDiscovering()?
-  bool HasDiscoverySession();
+  bool HasBluetoothDiscoverySession();
 
   // BluetoothAdapter::Observer:
   void AdapterPresentChanged(device::BluetoothAdapter* adapter,
                              bool present) override;
   void AdapterPoweredChanged(device::BluetoothAdapter* adapter,
                              bool powered) override;
   void AdapterDiscoveringChanged(device::BluetoothAdapter* adapter,
                                  bool discovering) override;
   void DeviceAdded(device::BluetoothAdapter* adapter,
                    device::BluetoothDevice* device) override;
@@ skipping 12 matching lines @@
 
   // Object could be deleted during a prolonged Bluetooth operation.
   base::WeakPtrFactory<TrayBluetoothHelper> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayBluetoothHelper);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SYSTEM_CHROMEOS_BLUETOOTH_TRAY_BLUETOOTH_HELPER_H_