diff --git a/api/transport/stun.h b/api/transport/stun.h
index 43e2a087a0..9751ed172b 100644
--- a/api/transport/stun.h
+++ b/api/transport/stun.h
@@ -178,7 +178,7 @@ class StunMessage {
   // is determined by the lengths of the transaction ID.
   bool IsLegacy() const;
 
-  void SetType(int type) { type_ = static_cast<uint16_t>(type); }
+  [[deprecated]] void SetType(int type) { type_ = static_cast<uint16_t>(type); }
   [[deprecated]] bool SetTransactionID(absl::string_view transaction_id) {
     if (!IsValidTransactionId(transaction_id))
       return false;
diff --git a/p2p/base/p2p_transport_channel_unittest.cc b/p2p/base/p2p_transport_channel_unittest.cc
index ccf8e4e1ca..86e11711cf 100644
--- a/p2p/base/p2p_transport_channel_unittest.cc
+++ b/p2p/base/p2p_transport_channel_unittest.cc
@@ -3747,8 +3747,7 @@ TEST_F(P2PTransportChannelPingTest, PingingStartedAsSoonAsPossible) {
 
   // Simulate a binding request being received, creating a peer reflexive
   // candidate pair while we still don't have remote ICE parameters.
-  IceMessage request;
-  request.SetType(STUN_BINDING_REQUEST);
+  IceMessage request(STUN_BINDING_REQUEST);
   request.AddAttribute(std::make_unique<StunByteStringAttribute>(
       STUN_ATTR_USERNAME, kIceUfrag[1]));
   uint32_t prflx_priority = ICE_TYPE_PREFERENCE_PRFLX << 24;
@@ -3916,8 +3915,7 @@ TEST_F(P2PTransportChannelPingTest, ConnectionResurrection) {
                    kMediumTimeout);
 
   // Create a minimal STUN message with prflx priority.
-  IceMessage request;
-  request.SetType(STUN_BINDING_REQUEST);
+  IceMessage request(STUN_BINDING_REQUEST);
   request.AddAttribute(std::make_unique<StunByteStringAttribute>(
       STUN_ATTR_USERNAME, kIceUfrag[1]));
   uint32_t prflx_priority = ICE_TYPE_PREFERENCE_PRFLX << 24;
@@ -4172,8 +4170,7 @@ TEST_F(P2PTransportChannelPingTest, TestSelectConnectionFromUnknownAddress) {
   ch.SetIceRole(ICEROLE_CONTROLLED);
   ch.MaybeStartGathering();
   // A minimal STUN message with prflx priority.
-  IceMessage request;
-  request.SetType(STUN_BINDING_REQUEST);
+  IceMessage request(STUN_BINDING_REQUEST);
   request.AddAttribute(std::make_unique<StunByteStringAttribute>(
       STUN_ATTR_USERNAME, kIceUfrag[1]));
   uint32_t prflx_priority = ICE_TYPE_PREFERENCE_PRFLX << 24;
@@ -4268,8 +4265,7 @@ TEST_F(P2PTransportChannelPingTest, TestSelectConnectionBasedOnMediaReceived) {
 
   // Now another STUN message with an unknown address and use_candidate will
   // nominate the selected connection.
-  IceMessage request;
-  request.SetType(STUN_BINDING_REQUEST);
+  IceMessage request(STUN_BINDING_REQUEST);
   request.AddAttribute(std::make_unique<StunByteStringAttribute>(
       STUN_ATTR_USERNAME, kIceUfrag[1]));
   uint32_t prflx_priority = ICE_TYPE_PREFERENCE_PRFLX << 24;
diff --git a/p2p/base/port_unittest.cc b/p2p/base/port_unittest.cc
index 5ef191b6cd..5b2ac8a293 100644
--- a/p2p/base/port_unittest.cc
+++ b/p2p/base/port_unittest.cc
@@ -3409,8 +3409,7 @@ TEST_F(PortTest, TestErrorResponseMakesGoogPingFallBackToStunBinding) {
   ASSERT_EQ(response2->type(), GOOG_PING_RESPONSE);
 
   // But rather than the RESPONSE...feedback an error.
-  StunMessage error_response;
-  error_response.SetType(GOOG_PING_ERROR_RESPONSE);
+  StunMessage error_response(GOOG_PING_ERROR_RESPONSE);
   error_response.SetTransactionIdForTesting(response2->transaction_id());
   error_response.AddMessageIntegrity32("rpass");
   rtc::ByteBufferWriter buf;
diff --git a/p2p/base/turn_port.cc b/p2p/base/turn_port.cc
index 6cb3da43c1..9f8c8d2f86 100644
--- a/p2p/base/turn_port.cc
+++ b/p2p/base/turn_port.cc
@@ -1649,7 +1649,7 @@ TurnCreatePermissionRequest::TurnCreatePermissionRequest(
       this, &TurnCreatePermissionRequest::OnEntryDestroyed);
   StunMessage* message = mutable_msg();
   // Create the request as indicated in RFC5766, Section 9.1.
-  message->SetType(TURN_CREATE_PERMISSION_REQUEST);
+  RTC_DCHECK_EQ(message->type(), TURN_CREATE_PERMISSION_REQUEST);
   message->AddAttribute(std::make_unique<StunXorAddressAttribute>(
       STUN_ATTR_XOR_PEER_ADDRESS, ext_addr_));
   if (port_->field_trials_ &&
diff --git a/test/network/network_emulation_unittest.cc b/test/network/network_emulation_unittest.cc
index ccc9c723c3..e985ae1859 100644
--- a/test/network/network_emulation_unittest.cc
+++ b/test/network/network_emulation_unittest.cc
@@ -651,8 +651,7 @@ TEST(NetworkEmulationManagerTURNTest, ClientTraffic) {
   int port = ep->BindReceiver(0, &recv).value();
 
   // Construct a STUN BINDING.
-  cricket::StunMessage ping;
-  ping.SetType(cricket::STUN_BINDING_REQUEST);
+  cricket::StunMessage ping(cricket::STUN_BINDING_REQUEST);
   rtc::ByteBufferWriter buf;
   ping.Write(&buf);
   rtc::CopyOnWriteBuffer packet(buf.Data(), buf.Length());