Revert of Implement BluetoothGattNotifySession::Stop on Android

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 114 matching lines @@
 
   if (expected == Call::EXPECTED)
     ++actual_success_callback_calls_;
   else
     unexpected_success_callback_ = true;
 }
 
 void BluetoothTestBase::NotifyCallback(
     Call expected,
     std::unique_ptr<BluetoothGattNotifySession> notify_session) {
+  ++callback_count_;
   notify_sessions_.push_back(notify_session.release());
 
-  ++callback_count_;
-  if (expected == Call::EXPECTED)
-    ++actual_success_callback_calls_;
-  else
-    unexpected_success_callback_ = true;
-}
-
-void BluetoothTestBase::NotifyCheckForPrecedingCalls(
-    int num_of_preceding_calls,
-    std::unique_ptr<BluetoothGattNotifySession> notify_session) {
-  EXPECT_EQ(num_of_preceding_calls, callback_count_);
-
-  notify_sessions_.push_back(notify_session.release());
-
-  ++callback_count_;
-  ++actual_success_callback_calls_;
-}
-
-void BluetoothTestBase::StopNotifyCallback(Call expected) {
-  ++callback_count_;
-
   if (expected == Call::EXPECTED)
     ++actual_success_callback_calls_;
   else
     unexpected_success_callback_ = true;
 }
 
-void BluetoothTestBase::StopNotifyCheckForPrecedingCalls(
-    int num_of_preceding_calls) {
-  EXPECT_EQ(num_of_preceding_calls, callback_count_);
-
-  ++callback_count_;
-  ++actual_success_callback_calls_;
-}
-
 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);
 }
 
-BluetoothRemoteGattCharacteristic::NotifySessionCallback
-BluetoothTestBase::GetNotifyCheckForPrecedingCalls(int num_of_preceding_calls) {
-  ++expected_success_callback_calls_;
-  return base::Bind(&BluetoothTestBase::NotifyCheckForPrecedingCalls,
-                    weak_factory_.GetWeakPtr(), num_of_preceding_calls);
-}
-
-base::Closure BluetoothTestBase::GetStopNotifyCallback(Call expected) {
-  if (expected == Call::EXPECTED)
-    ++expected_success_callback_calls_;
-  return base::Bind(&BluetoothTestBase::StopNotifyCallback,
-                    weak_factory_.GetWeakPtr(), expected);
-}
-
-base::Closure BluetoothTestBase::GetStopNotifyCheckForPrecedingCalls(
-    int num_of_preceding_calls) {
-  ++expected_success_callback_calls_;
-  return base::Bind(&BluetoothTestBase::StopNotifyCheckForPrecedingCalls,
-                    weak_factory_.GetWeakPtr(), num_of_preceding_calls);
-}
-
 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