Migrate Chrome OS Bluetooth UI to the new discovery API.

chrome/browser/ui/ash/system_tray_delegate_chromeos.h

Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.h
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
index c37575aac986e10196baf43b853cf5f2b2d6246a..0ae7d427d6bc34b688d6660d6794cf23ac1a3a4a 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
@@ -29,6 +29,7 @@
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "device/bluetooth/bluetooth_adapter.h"
+#include "device/bluetooth/bluetooth_discovery_session.h"
 
 namespace chromeos {
 
@@ -222,6 +223,9 @@ class SystemTrayDelegateChromeOS
   virtual void DeviceRemoved(device::BluetoothAdapter* adapter,
                              device::BluetoothDevice* device) OVERRIDE;
 
+  void OnStartDiscoverySession(

[Daniel Erat, 2014/02/28 21:22:36]

nit: mind renaming this to something like OnStartBluetoothDiscoverySession? it
seems a bit vaguely-named otherwise

[armansito, 2014/02/28 22:52:02]

Done.

+      scoped_ptr<device::BluetoothDiscoverySession> discovery_session);
+
   // Overridden from SystemKeyEventListener::CapsLockObserver.
   virtual void OnCapsLockChange(bool enabled) OVERRIDE;
 
@@ -249,8 +253,10 @@ class SystemTrayDelegateChromeOS
   bool have_session_length_limit_;
   base::TimeDelta session_length_limit_;
   std::string enterprise_domain_;
+  bool bluetooth_should_discover_;

[Daniel Erat, 2014/02/28 21:22:36]

nit: rename to something like "do_bluetooth_discovery_" or
"should_do_bluetooth_discovery_"

[armansito, 2014/02/28 22:52:02]

Done.

 
   scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
+  scoped_ptr<device::BluetoothDiscoverySession> bluetooth_discovery_session_;
   scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_;
   scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_;
   scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_;