Implement BluetoothGattNotifySession::Stop on Android, 2nd attempt

device/bluetooth/test/bluetooth_test.cc

 // Copyright 2015 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/test/bluetooth_test.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 123 matching lines @@
     std::unique_ptr<BluetoothGattNotifySession> notify_session) {
   ++callback_count_;
   notify_sessions_.push_back(notify_session.release());
 
   if (expected == Call::EXPECTED)
     ++actual_success_callback_calls_;
   else
     unexpected_success_callback_ = true;
 }
 
+void BluetoothTestBase::StopNotifyCallback(
+    Call expected,
+    BluetoothGattNotifySession* notify_session) {
+  ++callback_count_;
+  for (ScopedVector<BluetoothGattNotifySession>::iterator i =

[ortuno, 2016/08/02 01:56:34]

If you do this then you never get a chance to test the state of the
NotifySession after the callback is called.

[tommyt, 2016/08/05 12:22:30]

I have removed this and adjusted the unittests.

+           notify_sessions_.begin();
+       i != notify_sessions_.end(); ++i) {
+    if (*i == notify_session) {
+      notify_sessions_.erase(i);
+      break;
+    }
+  }
+
+  if (expected == Call::EXPECTED)
+    ++actual_success_callback_calls_;
+  else
+    unexpected_success_callback_ = true;
+}
+
 void BluetoothTestBase::ReadValueCallback(Call expected,
                                           const std::vector<uint8_t>& value) {
   ++callback_count_;
   last_read_value_ = value;
 
   if (expected == Call::EXPECTED)
     ++actual_success_callback_calls_;
   else
     unexpected_success_callback_ = true;
 }
@@ skipping 96 matching lines @@
 }
 
 BluetoothRemoteGattCharacteristic::NotifySessionCallback
 BluetoothTestBase::GetNotifyCallback(Call expected) {
   if (expected == Call::EXPECTED)
     ++expected_success_callback_calls_;
   return base::Bind(&BluetoothTestBase::NotifyCallback,
                     weak_factory_.GetWeakPtr(), expected);
 }
 
+base::Closure BluetoothTestBase::GetStopNotifyCallback(
+    Call expected,
+    BluetoothGattNotifySession* notify_session) {
+  if (expected == Call::EXPECTED)
+    ++expected_success_callback_calls_;
+  return base::Bind(&BluetoothTestBase::StopNotifyCallback,
+                    weak_factory_.GetWeakPtr(), expected, notify_session);
+}
+
 BluetoothRemoteGattCharacteristic::ValueCallback
 BluetoothTestBase::GetReadValueCallback(Call expected) {
   if (expected == Call::EXPECTED)
     ++expected_success_callback_calls_;
   return base::Bind(&BluetoothTestBase::ReadValueCallback,
                     weak_factory_.GetWeakPtr(), expected);
 }
 
 BluetoothAdapter::ErrorCallback BluetoothTestBase::GetErrorCallback(
     Call expected) {
@@ skipping 54 matching lines @@
   gatt_write_characteristic_attempts_ = 0;
   gatt_read_descriptor_attempts_ = 0;
   gatt_write_descriptor_attempts_ = 0;
 }
 
 void BluetoothTestBase::RemoveTimedOutDevices() {
   adapter_->RemoveTimedOutDevices();
 }
 
 }  // namespace device