Simplified BluetoothAdapterWin.

device/bluetooth/bluetooth_adapter_win_unittest.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 <string>
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/test/test_simple_task_runner.h"
 #include "device/bluetooth/bluetooth_adapter.h"
@@ skipping 14 matching lines @@
   state->name = name;
   state->address = address;
   state->bluetooth_class = 0;
   state->authenticated = false;
   state->connected = false;
 }
 
 class AdapterObserver : public device::BluetoothAdapter::Observer {
  public:
   AdapterObserver() {
-    Clear();
-  }
-
-  void Clear() {
     num_present_changed_ = 0;
     num_powered_changed_ = 0;
     num_discovering_changed_ = 0;
     num_device_added_ = 0;
-    num_device_changed_ = 0;
-    num_device_removed_ = 0;
   }
 
   virtual void AdapterPresentChanged(
       device::BluetoothAdapter* adapter, bool present) OVERRIDE {
     num_present_changed_++;
   }
 
   virtual void AdapterPoweredChanged(
       device::BluetoothAdapter* adapter, bool powered) OVERRIDE {
     num_powered_changed_++;
   }
 
   virtual void AdapterDiscoveringChanged(
       device::BluetoothAdapter* adapter, bool discovering) OVERRIDE {
     num_discovering_changed_++;
   }
 
   virtual void DeviceAdded(
       device::BluetoothAdapter* adapter,
       device::BluetoothDevice* device) OVERRIDE {
     num_device_added_++;
   }
 
-  virtual void DeviceChanged(
-      device::BluetoothAdapter* adapter,
-      device::BluetoothDevice* device) OVERRIDE {
-    num_device_changed_++;
-  }
-
-  virtual void DeviceRemoved(
-      device::BluetoothAdapter* adapter,
-      device::BluetoothDevice* device) OVERRIDE {
-    num_device_removed_++;
-  }
-
   int num_present_changed() const {
     return num_present_changed_;
   }
 
   int num_powered_changed() const {
     return num_powered_changed_;
   }
 
   int num_discovering_changed() const {
     return num_discovering_changed_;
   }
 
   int num_device_added() const {
     return num_device_added_;
   }
 
-  int num_device_changed() const {
-    return num_device_changed_;
-  }
-
-  int num_device_removed() const {
-    return num_device_removed_;
-  }
-
  private:
   int num_present_changed_;
   int num_powered_changed_;
   int num_discovering_changed_;
   int num_device_added_;
-  int num_device_changed_;
-  int num_device_removed_;
 };
 
 }  // namespace
 
 namespace device {
 
 class BluetoothAdapterWinTest : public testing::Test {
  public:
   BluetoothAdapterWinTest()
       : ui_task_runner_(new base::TestSimpleTaskRunner()),
@@ skipping 392 matching lines @@
   BluetoothTaskManagerWin::DeviceState* iphone_state =
       new BluetoothTaskManagerWin::DeviceState();
   MakeDeviceState("phone", "iphone address", iphone_state);
   ScopedVector<BluetoothTaskManagerWin::DeviceState> devices;
   devices.push_back(android_phone_state);
   devices.push_back(laptop_state);
   devices.push_back(iphone_state);
 
   adapter_win_->DevicesDiscovered(devices);
   EXPECT_EQ(3, adapter_observer_.num_device_added());
-  adapter_observer_.Clear();
-
-  iphone_state->name = "apple phone";
-  adapter_win_->DevicesDiscovered(devices);
-  EXPECT_EQ(0, adapter_observer_.num_device_added());
-  EXPECT_EQ(1, adapter_observer_.num_device_changed());
-  EXPECT_EQ(0, adapter_observer_.num_device_removed());
-  adapter_observer_.Clear();
-
-  laptop_state->address = "notebook address";
-  laptop_state->connected = true;
-  adapter_win_->DevicesDiscovered(devices);
-  EXPECT_EQ(1, adapter_observer_.num_device_added());
-  EXPECT_EQ(0, adapter_observer_.num_device_changed());
-  EXPECT_EQ(1, adapter_observer_.num_device_removed());
-  adapter_observer_.Clear();
-
-  devices.clear();
-  adapter_win_->DevicesDiscovered(devices);
-
-  EXPECT_EQ(2, adapter_observer_.num_device_removed());
-  EXPECT_EQ(1, adapter_observer_.num_device_changed());
 }
 
 }  // namespace device