Simplified BluetoothAdapterWin.

device/bluetooth/bluetooth_task_manager_win.cc

 // Copyright (c) 2012 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_task_manager_win.h"
 
 #include <winsock2.h>
 
 #include <string>
 
@@ skipping 170 matching lines @@
   FOR_EACH_OBSERVER(BluetoothTaskManagerWin::Observer, observers_,
                     DiscoveryStarted(success));
 }
 
 void BluetoothTaskManagerWin::OnDiscoveryStopped() {
   DCHECK(ui_task_runner_->RunsTasksOnCurrentThread());
   FOR_EACH_OBSERVER(BluetoothTaskManagerWin::Observer, observers_,
                     DiscoveryStopped());
 }
 
+void BluetoothTaskManagerWin::OnDevicesUpdated(
+    const ScopedVector<DeviceState>* devices) {
+  DCHECK(ui_task_runner_->RunsTasksOnCurrentThread());
+  FOR_EACH_OBSERVER(BluetoothTaskManagerWin::Observer, observers_,
+                    DevicesUpdated(*devices));
+}
+
 void BluetoothTaskManagerWin::OnDevicesDiscovered(
     const ScopedVector<DeviceState>* devices) {
   DCHECK(ui_task_runner_->RunsTasksOnCurrentThread());
   FOR_EACH_OBSERVER(BluetoothTaskManagerWin::Observer, observers_,
                     DevicesDiscovered(*devices));
 }
 
 void BluetoothTaskManagerWin::PollAdapter() {
   DCHECK(bluetooth_task_runner_->RunsTasksOnCurrentThread());
 
@@ skipping 113 matching lines @@
 void BluetoothTaskManagerWin::GetKnownDevices() {
   ScopedVector<DeviceState>* device_list = new ScopedVector<DeviceState>();
   SearchDevices(1, true, device_list);
   if (device_list->empty()) {
     delete device_list;
     return;
   }
   DiscoverServices(device_list);
   ui_task_runner_->PostTask(
       FROM_HERE,
-      base::Bind(&BluetoothTaskManagerWin::OnDevicesDiscovered,
+      base::Bind(&BluetoothTaskManagerWin::OnDevicesUpdated,
                  this,
                  base::Owned(device_list)));
 }
 
 void BluetoothTaskManagerWin::SearchDevices(
     int timeout,
     bool search_cached_devices_only,
     ScopedVector<DeviceState>* device_list) {
   BLUETOOTH_DEVICE_SEARCH_PARAMS device_search_params = {
       sizeof(BLUETOOTH_DEVICE_SEARCH_PARAMS),
       1,  // return authenticated devices
-      1,  // return remembered devices
+      1,  // return remembered devicess
       search_cached_devices_only ? 0 : 1,  // return unknown devices
       1,  // return connected devices
       search_cached_devices_only ? 0 : 1,  // issue a new inquiry
       timeout,  // timeout for the inquiry in increments of 1.28 seconds
       adapter_handle_
   };
 
   BLUETOOTH_DEVICE_INFO device_info = { sizeof(BLUETOOTH_DEVICE_INFO), 0 };
   // Issues a device inquiry and waits for |timeout| * 1.28 seconds.
   HBLUETOOTH_DEVICE_FIND handle =
@@ skipping 51 matching lines @@
         service_record_state->sdp_bytes.push_back(
             sdp_result_data->lpBlob->pBlobData[i]);
       }
       service_record_states->push_back(service_record_state);
     }
     WSALookupServiceEnd(sdp_handle);
   }
 }
 
 }  // namespace device