From e703b21cde63b303b41157dd7b71b80a7916025b Mon Sep 17 00:00:00 2001
From: Janusz Sobczak <jsobczak@google.com>
Date: Wed, 9 Aug 2023 14:50:30 -0700
Subject: [PATCH] Fix connections_test

PiperOrigin-RevId: 555282324
---
 .../c/bluetooth_classic_server_socket_test.cc | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/connections/c/bluetooth_classic_server_socket_test.cc b/connections/c/bluetooth_classic_server_socket_test.cc
index 10cb1051..2b0e1394 100644
--- a/connections/c/bluetooth_classic_server_socket_test.cc
+++ b/connections/c/bluetooth_classic_server_socket_test.cc
@@ -117,10 +117,10 @@ TEST(BluetoothClassicServerSocketTest,
   PerformanceTimer::start();
 
   core.StartAdvertising(SERVICE_ID, AdvertiseOptions, request_info,
-                        {.result_cb = [&](Status status) {
+                        [&](Status status) {
                           request_result = status;
                           notification.Notify();
-                        }});
+                        });
 
   if (notification.WaitForNotificationWithTimeout(
           absl::Seconds(TimeoutSeconds))) {
@@ -163,10 +163,10 @@ TEST(BluetoothClassicServerSocketTest,
   PerformanceTimer::start();
 
   core.StartAdvertising(SERVICE_ID, AdvertiseOptions, request_info,
-                        {.result_cb = [&](Status status) {
+                        [&](Status status) {
                           request_result = status;
                           notification2.Notify();
-                        }});
+                        });
 
   if (notification2.WaitForNotificationWithTimeout(
           absl::Seconds(TimeoutSeconds))) {
@@ -209,10 +209,10 @@ TEST(BluetoothClassicServerSocketTest,
 
   PerformanceTimer::start();
 
-  core.StopAdvertising({.result_cb = [&](Status status) {
+  core.StopAdvertising([&](Status status) {
     request_result = status;
     notification3.Notify();
-  }});
+  });
 
   if (notification3.WaitForNotificationWithTimeout(
           absl::Seconds(TimeoutSeconds))) {
@@ -273,10 +273,10 @@ TEST(BluetoothClassicServerSocketTest, DISABLED_MultiRunWithTimeoutReproStuck) {
     PerformanceTimer::start();
 
     core.StartAdvertising(SERVICE_ID, AdvertiseOptions, request_info,
-                          {.result_cb = [&](Status status) {
+                          [&](Status status) {
                             request_result = status;
                             notification.Notify();
-                          }});
+                          });
 
     if (notification.WaitForNotificationWithTimeout(
             absl::Seconds(TimeoutSeconds))) {
@@ -319,10 +319,10 @@ TEST(BluetoothClassicServerSocketTest, DISABLED_MultiRunWithTimeoutReproStuck) {
     PerformanceTimer::start();
 
     core.StartAdvertising(SERVICE_ID, AdvertiseOptions, request_info,
-                          {.result_cb = [&](Status status) {
+                          [&](Status status) {
                             request_result = status;
                             notification2.Notify();
-                          }});
+                          });
 
     if (notification2.WaitForNotificationWithTimeout(
             absl::Seconds(TimeoutSeconds))) {
@@ -361,10 +361,10 @@ TEST(BluetoothClassicServerSocketTest, DISABLED_MultiRunWithTimeoutReproStuck) {
 
     PerformanceTimer::start();
 
-    core.StopAdvertising({.result_cb = [&](Status status) {
+    core.StopAdvertising([&](Status status) {
       request_result = status;
       notification3.Notify();
-    }});
+    });
 
     if (notification3.WaitForNotificationWithTimeout(
             absl::Seconds(TimeoutSeconds))) {
@@ -424,10 +424,10 @@ TEST(BluetoothClassicServerSocketTest, DISABLED_SingleRunNoTimeoutReproStuck) {
   PerformanceTimer::start();
 
   core.StartAdvertising(SERVICE_ID, AdvertiseOptions, request_info,
-                        {.result_cb = [&](Status status) {
+                        [&](Status status) {
                           request_result = status;
                           notification.Notify();
-                        }});
+                        });
 
   notification.WaitForNotification();
   PerformanceTimer::stop();
@@ -451,10 +451,10 @@ TEST(BluetoothClassicServerSocketTest, DISABLED_SingleRunNoTimeoutReproStuck) {
   PerformanceTimer::start();
 
   core.StartAdvertising(SERVICE_ID, AdvertiseOptions, request_info,
-                        {.result_cb = [&](Status status) {
+                        [&](Status status) {
                           request_result = status;
                           notification2.Notify();
-                        }});
+                        });
 
   notification2.WaitForNotification();
   PerformanceTimer::stop();
@@ -477,10 +477,10 @@ TEST(BluetoothClassicServerSocketTest, DISABLED_SingleRunNoTimeoutReproStuck) {
 
   PerformanceTimer::start();
 
-  core.StopAdvertising({.result_cb = [&](Status status) {
+  core.StopAdvertising([&](Status status) {
     request_result = status;
     notification3.Notify();
-  }});
+  });
 
   notification3.WaitForNotification();
   PerformanceTimer::stop();
@@ -521,10 +521,10 @@ TEST(BluetoothClassicServerSocketTest, DISABLED_MultiRunNoTimeoutReproStuck) {
     PerformanceTimer::start();
 
     core.StartAdvertising(SERVICE_ID, AdvertiseOptions, request_info,
-                          {.result_cb = [&](Status status) {
+                          [&](Status status) {
                             request_result = status;
                             notification.Notify();
-                          }});
+                          });
 
     notification.WaitForNotification();
 
@@ -551,10 +551,10 @@ TEST(BluetoothClassicServerSocketTest, DISABLED_MultiRunNoTimeoutReproStuck) {
     PerformanceTimer::start();
 
     core.StartAdvertising(SERVICE_ID, AdvertiseOptions, request_info,
-                          {.result_cb = [&](Status status) {
+                          [&](Status status) {
                             request_result = status;
                             notification2.Notify();
-                          }});
+                          });
 
     notification2.WaitForNotification();
     PerformanceTimer::stop();
@@ -580,10 +580,10 @@ TEST(BluetoothClassicServerSocketTest, DISABLED_MultiRunNoTimeoutReproStuck) {
 
     PerformanceTimer::start();
 
-    core.StopAdvertising({.result_cb = [&](Status status) {
+    core.StopAdvertising([&](Status status) {
       request_result = status;
       notification3.Notify();
-    }});
+    });
 
     notification3.WaitForNotification();
     PerformanceTimer::stop();