Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c723c4a8 authored by Wei-Luan Wang's avatar Wei-Luan Wang Committed by Jakub Pawłowski
Browse files

Migrate legacy base::Callback type for ConnectionCallback 

base::Bind and base::Callback are deprecated. Migrate the usages to
proper replacements.

The callback |ConnectionCallback| is called any time a new AVRCP device
is connected so it could be called multiple times and thus a
base::RepeatingCallback.

Bug: 272116782
Test: m .
Flag: EXEMPT mechanical refactor
Change-Id: I7b0bce14479458b9bfbcc8a4583c8ef16811f183
parent b5bc2efc

system/btif/avrcp/avrcp_service.cc

+2 −1
Original line number Diff line number Diff line
@@ -413,7 +413,8 @@ void AvrcpService::Init(MediaInterface* media_interface, 
  player_settings_interface_ = wrapped_player_settings_interface;



  ConnectionHandler::Initialize(

      base::Bind(&AvrcpService::DeviceCallback, base::Unretained(instance_)),

      base::BindRepeating(&AvrcpService::DeviceCallback,

                          base::Unretained(instance_)),

      &avrcp_interface_, &sdp_interface_, wrapped_volume_interface);

  connection_handler_ = ConnectionHandler::Get();

}

system/profile/avrcp/connection_handler.h

+2 −1
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ class ConnectionHandler { 
   * A reference to the new Avrcp device is located in the shared_ptr.

   * If there was an issue during connection the pointer value will be null.

   */

  using ConnectionCallback = base::Callback<void(std::shared_ptr<Device>)>;

  using ConnectionCallback =

      base::RepeatingCallback<void(std::shared_ptr<Device>)>;



  /**

   * Initializes the singleton instance and sets up SDP. Also Opens the

system/profile/avrcp/tests/avrcp_connection_handler_test.cc

+28 −28
Original line number Diff line number Diff line
@@ -105,8 +105,8 @@ TEST_F(AvrcpConnectionHandlerTest, initializeTest) { 
      .WillOnce(

          DoAll(SetArgPointee<0>(1), SaveArgPointee<1>(&conn_cb), Return(0)));



  auto bound_callback = base::Bind(&MockFunction<void(device_ptr)>::Call,

                                   base::Unretained(&device_cb));

  auto bound_callback = base::BindRepeating(

      &MockFunction<void(device_ptr)>::Call, base::Unretained(&device_cb));

  ASSERT_TRUE(ConnectionHandler::Initialize(bound_callback, &mock_avrcp_,

                                            &mock_sdp_, &mock_volume_));

  connection_handler_ = ConnectionHandler::Get();
@@ -129,8 +129,8 @@ TEST_F(AvrcpConnectionHandlerTest, notConnectedDisconnectTest) { 
          DoAll(SetArgPointee<0>(1), SaveArgPointee<1>(&conn_cb), Return(0)));



  // Initialize the interface

  auto bound_callback = base::Bind(&MockFunction<void(device_ptr)>::Call,

                                   base::Unretained(&device_cb));

  auto bound_callback = base::BindRepeating(

      &MockFunction<void(device_ptr)>::Call, base::Unretained(&device_cb));

  ASSERT_TRUE(ConnectionHandler::Initialize(bound_callback, &mock_avrcp_,

                                            &mock_sdp_, &mock_volume_));

  connection_handler_ = ConnectionHandler::Get();
@@ -153,8 +153,8 @@ TEST_F(AvrcpConnectionHandlerTest, disconnectAfterCleanupTest) { 
          DoAll(SetArgPointee<0>(1), SaveArgPointee<1>(&conn_cb), Return(0)));



  // Initialize the interface

  auto bound_callback = base::Bind(&MockFunction<void(device_ptr)>::Call,

                                   base::Unretained(&device_cb));

  auto bound_callback = base::BindRepeating(

      &MockFunction<void(device_ptr)>::Call, base::Unretained(&device_cb));

  ASSERT_TRUE(ConnectionHandler::Initialize(bound_callback, &mock_avrcp_,

                                            &mock_sdp_, &mock_volume_));

  connection_handler_ = ConnectionHandler::Get();
@@ -182,8 +182,8 @@ TEST_F(AvrcpConnectionHandlerTest, remoteDeviceConnectionTest) { 
          DoAll(SetArgPointee<0>(2), SaveArgPointee<1>(&conn_cb), Return(0)));



  // Initialize the interface

  auto bound_callback = base::Bind(&MockFunction<void(device_ptr)>::Call,

                                   base::Unretained(&device_cb));

  auto bound_callback = base::BindRepeating(

      &MockFunction<void(device_ptr)>::Call, base::Unretained(&device_cb));

  ASSERT_TRUE(ConnectionHandler::Initialize(bound_callback, &mock_avrcp_,

                                            &mock_sdp_, &mock_volume_));

  connection_handler_ = ConnectionHandler::Get();
@@ -228,8 +228,8 @@ TEST_F(AvrcpConnectionHandlerTest, noAbsoluteVolumeTest) { 
          DoAll(SetArgPointee<0>(2), SaveArgPointee<1>(&conn_cb), Return(0)));



  // Initialize the interface

  auto bound_callback = base::Bind(&MockFunction<void(device_ptr)>::Call,

                                   base::Unretained(&device_cb));

  auto bound_callback = base::BindRepeating(

      &MockFunction<void(device_ptr)>::Call, base::Unretained(&device_cb));

  ASSERT_TRUE(ConnectionHandler::Initialize(bound_callback, &mock_avrcp_,

                                            &mock_sdp_, &mock_volume_));

  connection_handler_ = ConnectionHandler::Get();
@@ -266,8 +266,8 @@ TEST_F(AvrcpConnectionHandlerTest, absoluteVolumeTest) { 
          DoAll(SetArgPointee<0>(2), SaveArgPointee<1>(&conn_cb), Return(0)));



  // Initialize the interface

  auto bound_callback = base::Bind(&MockFunction<void(device_ptr)>::Call,

                                   base::Unretained(&device_cb));

  auto bound_callback = base::BindRepeating(

      &MockFunction<void(device_ptr)>::Call, base::Unretained(&device_cb));



  StrictMock<MockVolumeInterface> strict_volume;

  ASSERT_TRUE(ConnectionHandler::Initialize(bound_callback, &mock_avrcp_,
@@ -300,8 +300,8 @@ TEST_F(AvrcpConnectionHandlerTest, disconnectTest) { 
      .WillOnce(DoAll(SetArgPointee<0>(2), Return(0)));



  // Initialize the interface

  auto bound_callback = base::Bind(&MockFunction<void(device_ptr)>::Call,

                                   base::Unretained(&device_cb));

  auto bound_callback = base::BindRepeating(

      &MockFunction<void(device_ptr)>::Call, base::Unretained(&device_cb));

  ASSERT_TRUE(ConnectionHandler::Initialize(bound_callback, &mock_avrcp_,

                                            &mock_sdp_, &mock_volume_));

  connection_handler_ = ConnectionHandler::Get();
@@ -338,8 +338,8 @@ TEST_F(AvrcpConnectionHandlerTest, multipleRemoteDeviceConnectionTest) { 
          DoAll(SetArgPointee<0>(3), SaveArgPointee<1>(&conn_cb), Return(0)));



  // Initialize the interface

  auto bound_callback = base::Bind(&MockFunction<void(device_ptr)>::Call,

                                   base::Unretained(&device_cb));

  auto bound_callback = base::BindRepeating(

      &MockFunction<void(device_ptr)>::Call, base::Unretained(&device_cb));

  ASSERT_TRUE(ConnectionHandler::Initialize(bound_callback, &mock_avrcp_,

                                            &mock_sdp_, &mock_volume_));

  connection_handler_ = ConnectionHandler::Get();
@@ -397,8 +397,8 @@ TEST_F(AvrcpConnectionHandlerTest, cleanupTest) { 
          DoAll(SetArgPointee<0>(3), SaveArgPointee<1>(&conn_cb), Return(0)));



  // Initialize the interface

  auto bound_callback = base::Bind(&MockFunction<void(device_ptr)>::Call,

                                   base::Unretained(&device_cb));

  auto bound_callback = base::BindRepeating(

      &MockFunction<void(device_ptr)>::Call, base::Unretained(&device_cb));

  ASSERT_TRUE(ConnectionHandler::Initialize(bound_callback, &mock_avrcp_,

                                            &mock_sdp_, &mock_volume_));

  connection_handler_ = ConnectionHandler::Get();
@@ -419,8 +419,8 @@ TEST_F(AvrcpConnectionHandlerTest, cleanupTest) { 


TEST_F(AvrcpConnectionHandlerTest, connectToRemoteDeviceTest) {

  // Initialize the interface

  auto bound_callback = base::Bind(&MockFunction<void(device_ptr)>::Call,

                                   base::Unretained(&device_cb));

  auto bound_callback = base::BindRepeating(

      &MockFunction<void(device_ptr)>::Call, base::Unretained(&device_cb));

  ASSERT_TRUE(ConnectionHandler::Initialize(bound_callback, &mock_avrcp_,

                                            &mock_sdp_, &mock_volume_));

  connection_handler_ = ConnectionHandler::Get();
@@ -464,8 +464,8 @@ TEST_F(AvrcpConnectionHandlerTest, connectToRemoteDeviceTest) { 


TEST_F(AvrcpConnectionHandlerTest, connectToBrowsableRemoteDeviceTest) {

  // Initialize the interface

  auto bound_callback = base::Bind(&MockFunction<void(device_ptr)>::Call,

                                   base::Unretained(&device_cb));

  auto bound_callback = base::BindRepeating(

      &MockFunction<void(device_ptr)>::Call, base::Unretained(&device_cb));

  ASSERT_TRUE(ConnectionHandler::Initialize(bound_callback, &mock_avrcp_,

                                            &mock_sdp_, &mock_volume_));

  connection_handler_ = ConnectionHandler::Get();
@@ -518,8 +518,8 @@ TEST_F(AvrcpConnectionHandlerTest, disconnectWhileDoingSdpTest) { 
      .WillOnce(DoAll(SetArgPointee<0>(2), Return(0)));



  // Initialize the interface

  auto bound_callback = base::Bind(&MockFunction<void(device_ptr)>::Call,

                                   base::Unretained(&device_cb));

  auto bound_callback = base::BindRepeating(

      &MockFunction<void(device_ptr)>::Call, base::Unretained(&device_cb));

  ASSERT_TRUE(ConnectionHandler::Initialize(bound_callback, &mock_avrcp_,

                                            &mock_sdp_, &mock_volume_));

  connection_handler_ = ConnectionHandler::Get();
@@ -556,8 +556,8 @@ TEST_F(AvrcpConnectionHandlerTest, connectionCollisionTest) { 
          DoAll(SetArgPointee<0>(2), SaveArgPointee<1>(&conn_cb), Return(0)));



  // Initialize the interface

  auto bound_callback = base::Bind(&MockFunction<void(device_ptr)>::Call,

                                   base::Unretained(&device_cb));

  auto bound_callback = base::BindRepeating(

      &MockFunction<void(device_ptr)>::Call, base::Unretained(&device_cb));

  ASSERT_TRUE(ConnectionHandler::Initialize(bound_callback, &mock_avrcp_,

                                            &mock_sdp_, &mock_volume_));

  connection_handler_ = ConnectionHandler::Get();
@@ -611,8 +611,8 @@ TEST_F(AvrcpConnectionHandlerTest, acceptorSdpSearchFailTest) { 
          DoAll(SetArgPointee<0>(2), SaveArgPointee<1>(&conn_cb), Return(0)));



  // Initialize the interface

  auto bound_callback = base::Bind(&MockFunction<void(device_ptr)>::Call,

                                   base::Unretained(&device_cb));

  auto bound_callback = base::BindRepeating(

      &MockFunction<void(device_ptr)>::Call, base::Unretained(&device_cb));

  ASSERT_TRUE(ConnectionHandler::Initialize(bound_callback, &mock_avrcp_,

                                            &mock_sdp_, &mock_volume_));

  connection_handler_ = ConnectionHandler::Get();