Migrate Chrome OS Bluetooth UI to the new discovery API.

chrome/browser/ui/ash/system_tray_delegate_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 "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 232 matching lines @@
 }  // namespace
 
 SystemTrayDelegateChromeOS::SystemTrayDelegateChromeOS()
     : weak_ptr_factory_(this),
       user_profile_(NULL),
       clock_type_(base::GetHourClockType()),
       search_key_mapped_to_(input_method::kSearchKey),
       screen_locked_(false),
       have_session_start_time_(false),
       have_session_length_limit_(false),
+      bluetooth_should_discover_(false),
       volume_control_delegate_(new VolumeController()),
       device_settings_observer_(CrosSettings::Get()->AddSettingsObserver(
           kSystemUse24HourClock,
           base::Bind(&SystemTrayDelegateChromeOS::UpdateClockType,
                      base::Unretained(this)))) {
   // Register notifications on construction so that events such as
   // PROFILE_CREATED do not get missed if they happen before Initialize().
   registrar_.reset(new content::NotificationRegistrar);
   registrar_->Add(this,
                   chrome::NOTIFICATION_UPGRADE_RECOMMENDED,
@@ skipping 432 matching lines @@
     info.address = device->GetAddress();
     info.display_name = device->GetName();
     info.connected = device->IsConnected();
     info.connecting = device->IsConnecting();
     info.paired = device->IsPaired();
     list->push_back(info);
   }
 }
 
 void SystemTrayDelegateChromeOS::BluetoothStartDiscovering() {
-  bluetooth_adapter_->StartDiscovering(
+  if (bluetooth_discovery_session_.get() &&
+      bluetooth_discovery_session_->IsActive()) {
+    LOG(WARNING) << "Already have active Bluetooth device discovery session.";
+    return;
+  }
+  VLOG(1) << "Requesting new Bluetooth device discovery session.";
+  bluetooth_should_discover_ = true;
+  bluetooth_adapter_->StartDiscoverySession(
+      base::Bind(&SystemTrayDelegateChromeOS::OnStartDiscoverySession,
+                 weak_ptr_factory_.GetWeakPtr()),
+      base::Bind(&BluetoothSetDiscoveringError));
+}
+
+void SystemTrayDelegateChromeOS::BluetoothStopDiscovering() {
+  bluetooth_should_discover_ = false;
+  if (!bluetooth_discovery_session_.get() ||
+      !bluetooth_discovery_session_->IsActive()) {
+    LOG(WARNING) << "No active Bluetooth device discovery session.";
+    return;
+  }
+  VLOG(1) << "Stopping Bluetooth device discovery session.";
+  bluetooth_discovery_session_->Stop(
       base::Bind(&base::DoNothing), base::Bind(&BluetoothSetDiscoveringError));
 }
 
-void SystemTrayDelegateChromeOS::BluetoothStopDiscovering() {
-  bluetooth_adapter_->StopDiscovering(
-      base::Bind(&base::DoNothing), base::Bind(&BluetoothSetDiscoveringError));
-}
-
 void SystemTrayDelegateChromeOS::ConnectToBluetoothDevice(
     const std::string& address) {
   device::BluetoothDevice* device = bluetooth_adapter_->GetDevice(address);
   if (!device || device->IsConnecting() ||
       (device->IsConnected() && device->IsPaired())) {
     return;
   }
   if (device->IsPaired() && !device->IsConnectable())
     return;
   if (device->IsPaired() || !device->IsPairable()) {
@@ skipping 548 matching lines @@
     device::BluetoothDevice* device) {
   GetSystemTrayNotifier()->NotifyRefreshBluetooth();
 }
 
 void SystemTrayDelegateChromeOS::DeviceRemoved(
     device::BluetoothAdapter* adapter,
     device::BluetoothDevice* device) {
   GetSystemTrayNotifier()->NotifyRefreshBluetooth();
 }
 
+void SystemTrayDelegateChromeOS::OnStartDiscoverySession(
+    scoped_ptr<device::BluetoothDiscoverySession> discovery_session) {
+  // If the discovery session was returned after a request to stop discovery
+  // (e.g. the user dismissed the Bluetooth detailed view before the call
+  // returned), don't claim the discovery session and let it clean up.
+  if (!bluetooth_should_discover_)
+    return;
+  VLOG(1) << "Claiming new Bluetooth device discovery session.";
+  bluetooth_discovery_session_ = discovery_session.Pass();
+}
+
 // Overridden from SystemKeyEventListener::CapsLockObserver.
 void SystemTrayDelegateChromeOS::OnCapsLockChange(bool enabled) {
   bool search_mapped_to_caps_lock = false;
   if (!base::SysInfo::IsRunningOnChromeOS() ||
       search_key_mapped_to_ == input_method::kCapsLockKey)
     search_mapped_to_caps_lock = true;
   GetSystemTrayNotifier()->NotifyCapsLockChanged(enabled,
                                                  search_mapped_to_caps_lock);
 }
 
@@ skipping 29 matching lines @@
     accessibility_subscription_.reset();
   else
     OnAccessibilityModeChanged(details.notify);
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos