From aa7aee0485567e0027aa96cbe29e691681d19e58 Mon Sep 17 00:00:00 2001
From: Francis Tsui <ftsui@google.com>
Date: Mon, 18 Nov 2024 09:33:11 -0800
Subject: [PATCH] Fix TSAN error.

PiperOrigin-RevId: 697657230
---
 sharing/nearby_sharing_service_impl_test.cc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/sharing/nearby_sharing_service_impl_test.cc b/sharing/nearby_sharing_service_impl_test.cc
index d206365b..7da275f0 100644
--- a/sharing/nearby_sharing_service_impl_test.cc
+++ b/sharing/nearby_sharing_service_impl_test.cc
@@ -1063,6 +1063,15 @@ class NearbySharingServiceImplTest : public testing::Test {
 
     fake_nearby_connections_manager_->SetIncomingPayload(
         kFilePayloadId, GetFilePayload(kFilePayloadId));
+    EXPECT_CALL(callback, OnTransferUpdate(testing::_, testing::_, testing::_))
+        .WillRepeatedly(
+            testing::Invoke([&](const ShareTarget& share_target,
+                                const AttachmentContainer& container,
+                                TransferMetadata metadata) {
+              EXPECT_FALSE(metadata.is_final_status());
+              EXPECT_EQ(metadata.status(),
+                        TransferMetadata::Status::kInProgress);
+            }));
 
     absl::Notification block_notification;
     // Block the service thread so all PayloadTransferUpdate will be processed
@@ -1091,15 +1100,6 @@ class NearbySharingServiceImplTest : public testing::Test {
       }
     }
     block_notification.Notify();
-    EXPECT_CALL(callback, OnTransferUpdate(testing::_, testing::_, testing::_))
-        .WillRepeatedly(
-            testing::Invoke([&](const ShareTarget& share_target,
-                                const AttachmentContainer& container,
-                                TransferMetadata metadata) {
-              EXPECT_FALSE(metadata.is_final_status());
-              EXPECT_EQ(metadata.status(),
-                        TransferMetadata::Status::kInProgress);
-            }));
     FlushTesting();
 
     std::weak_ptr<NearbyConnectionsManager::PayloadStatusListener> listener =