bluetooth: Remove callback from BluetoothGattConnection::Disconnect

extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc

 // Copyright 2014 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 "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "device/bluetooth/test/mock_bluetooth_adapter.h"
 #include "device/bluetooth/test/mock_bluetooth_device.h"
 #include "device/bluetooth/test/mock_bluetooth_gatt_characteristic.h"
 #include "device/bluetooth/test/mock_bluetooth_gatt_connection.h"
@@ skipping 228 matching lines @@
                 HAS_2_TEMPLATE_PARAMS(int, k, typename, T),
                 AND_1_VALUE_PARAMS(p0)) {
   ::std::tr1::get<k>(args).Run(scoped_ptr<T>(p0));
 }
 
 BluetoothGattConnection* CreateGattConnection(
     const std::string& device_address,
     bool expect_disconnect) {
   testing::NiceMock<MockBluetoothGattConnection>* conn =
       new testing::NiceMock<MockBluetoothGattConnection>(device_address);
-
-  if (expect_disconnect) {
-    EXPECT_CALL(*conn, Disconnect(_))
-        .Times(1)
-        .WillOnce(InvokeCallbackArgument<0>());
-  } else {
-    EXPECT_CALL(*conn, Disconnect(_)).Times(0);
-  }
-
+  EXPECT_CALL(*conn, Disconnect()).Times(expect_disconnect ? 1 : 0);
   return conn;
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetServices) {
   ResultCatcher catcher;
   catcher.RestrictToBrowserContext(browser()->profile());
 
   std::vector<BluetoothGattService*> services;
   services.push_back(service0_.get());
   services.push_back(service1_.get());
@@ skipping 937 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, ConnectInProgress) {
   ResultCatcher catcher;
   catcher.RestrictToBrowserContext(browser()->profile());
 
   EXPECT_CALL(*mock_adapter_, GetDevice(kTestLeDeviceAddress0))
       .WillRepeatedly(Return(device0_.get()));
 
   BluetoothDevice::GattConnectionCallback connect_callback;
-  base::Closure disconnect_callback;
 
   testing::NiceMock<MockBluetoothGattConnection>* conn =
       new testing::NiceMock<MockBluetoothGattConnection>(
           kTestLeDeviceAddress0);
   scoped_ptr<BluetoothGattConnection> conn_ptr(conn);
-  EXPECT_CALL(*conn, Disconnect(_))
-      .Times(1)
-      .WillOnce(SaveArg<0>(&disconnect_callback));
+  EXPECT_CALL(*conn, Disconnect()).Times(1);
 
   EXPECT_CALL(*device0_, CreateGattConnection(_, _))
       .Times(1)
       .WillOnce(SaveArg<0>(&connect_callback));
 
   ExtensionTestMessageListener listener(true);
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/connect_in_progress")));
 
   EXPECT_TRUE(listener.WaitUntilSatisfied());
-  ASSERT_EQ("ready", listener.message()) << listener.message();
+  ASSERT_EQ("After 2nd connect fails due to 1st connect being in progress.",
+            listener.message())
+      << listener.message();
+  listener.Reset();
+
   connect_callback.Run(conn_ptr.Pass());
-
-  listener.Reset();
   EXPECT_TRUE(listener.WaitUntilSatisfied());
-  ASSERT_EQ("ready", listener.message()) << listener.message();
-  disconnect_callback.Run();
+  ASSERT_EQ("After 2nd call to disconnect.", listener.message())
+      << listener.message();
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, StartStopNotifications) {
   ResultCatcher catcher;
   catcher.RestrictToBrowserContext(browser()->profile());
 
   event_router()->GattServiceAdded(
       mock_adapter_, device0_.get(), service0_.get());
@@ skipping 80 matching lines @@
   catcher.RestrictToBrowserContext(browser()->profile());
 
   // Run the test.
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/register_advertisement")));
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 }  // namespace