Simplified BluetoothAdapterWin.

device/bluetooth/bluetooth_adapter_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_adapter_win.h"
 
 #include <hash_set>
 #include <string>
 #include <utility>
 
@@ skipping 115 matching lines @@
     // If there are stop discovery requests, post the stop discovery again.
     MaybePostStopDiscoveryTask();
   } else if (!on_stop_discovery_callbacks_.empty()) {
     // If there are stop discovery requests but start discovery has failed,
     // notify that stop discovery has been complete.
     DiscoveryStopped();
   }
 }
 
 void BluetoothAdapterWin::DiscoveryStopped() {
+  discovered_devices_.clear();
   bool was_discovering = IsDiscovering();
   discovery_status_ = NOT_DISCOVERING;
   for (std::vector<base::Closure>::const_iterator iter =
            on_stop_discovery_callbacks_.begin();
        iter != on_stop_discovery_callbacks_.end();
        ++iter) {
     ui_task_runner_->PostTask(FROM_HERE, *iter);
   }
   num_discovery_listeners_ = 0;
   on_stop_discovery_callbacks_.clear();
@@ skipping 28 matching lines @@
                       AdapterPoweredChanged(this, powered_));
   }
   if (!initialized_) {
     initialized_ = true;
     init_callback_.Run();
   }
 }
 
 void BluetoothAdapterWin::DevicesDiscovered(
     const ScopedVector<BluetoothTaskManagerWin::DeviceState>& devices) {
-  std::hash_set<std::string> device_address_list;
+  DCHECK(thread_checker_.CalledOnValidThread());
   for (ScopedVector<BluetoothTaskManagerWin::DeviceState>::const_iterator iter =
            devices.begin();
        iter != devices.end();
        ++iter) {
-    device_address_list.insert((*iter)->address);
-    DevicesMap::iterator found_device_iter = devices_.find((*iter)->address);
-
-    if (found_device_iter == devices_.end()) {
-      devices_[(*iter)->address] = new BluetoothDeviceWin(**iter);
+    if (discovered_devices_.find((*iter)->address) ==
+        discovered_devices_.end()) {
+      BluetoothDeviceWin device_win(**iter);
       FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
-                        DeviceAdded(this, devices_[(*iter)->address]));
-      continue;
+                        DeviceAdded(this, &device_win));
+      discovered_devices_.insert((*iter)->address);
     }
-    BluetoothDeviceWin* device_win =
-        static_cast<BluetoothDeviceWin*>(found_device_iter->second);
-    if (device_win->device_fingerprint() !=
-        BluetoothDeviceWin::ComputeDeviceFingerprint(**iter)) {
-      devices_[(*iter)->address] = new BluetoothDeviceWin(**iter);
-      FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
-                        DeviceChanged(this, devices_[(*iter)->address]));
-      delete device_win;
-    }
-  }
-
-  DevicesMap::iterator device_iter = devices_.begin();
-  while (device_iter != devices_.end()) {
-    if (device_address_list.find(device_iter->first) !=
-        device_address_list.end()) {
-      ++device_iter;
-      continue;
-    }
-    if (device_iter->second->IsConnected() || device_iter->second->IsPaired()) {
-      BluetoothDeviceWin* device_win =
-          static_cast<BluetoothDeviceWin*>(device_iter->second);
-      device_win->SetVisible(false);
-      FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
-                        DeviceChanged(this, device_win));
-      ++device_iter;
-      continue;
-    }
-    FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
-                      DeviceRemoved(this, device_iter->second));
-    delete device_iter->second;
-    device_iter = devices_.erase(device_iter);
   }
 }
 
+void BluetoothAdapterWin::DevicesUpdated(
+    const ScopedVector<BluetoothTaskManagerWin::DeviceState>& devices) {
+  STLDeleteValues(&devices_);
+  for (ScopedVector<BluetoothTaskManagerWin::DeviceState>::const_iterator iter =
+           devices.begin();
+       iter != devices.end();
+       ++iter) {
+    devices_[(*iter)->address] = new BluetoothDeviceWin(**iter);
+  }
+}
+
 void BluetoothAdapterWin::Init() {
   ui_task_runner_ = base::ThreadTaskRunnerHandle::Get();
   task_manager_ =
       new BluetoothTaskManagerWin(ui_task_runner_);
   task_manager_->AddObserver(this);
   task_manager_->Initialize();
 }
 
 void BluetoothAdapterWin::InitForTest(
     scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
@@ skipping 27 matching lines @@
     num_discovery_listeners_ -= on_stop_discovery_callbacks_.size();
     on_stop_discovery_callbacks_.clear();
     return;
   }
 
   discovery_status_ = DISCOVERY_STOPPING;
   task_manager_->PostStopDiscoveryTask();
 }
 
 }  // namespace device