diff --git a/api/transport/network_types.cc b/api/transport/network_types.cc
index d6495ce490..53d5e5a443 100644
--- a/api/transport/network_types.cc
+++ b/api/transport/network_types.cc
@@ -97,7 +97,7 @@ PacedPacketInfo::PacedPacketInfo(int probe_cluster_id,
       probe_cluster_min_bytes(probe_cluster_min_bytes) {}
 
 bool PacedPacketInfo::operator==(const PacedPacketInfo& rhs) const {
-  return send_bitrate_bps == rhs.send_bitrate_bps &&
+  return send_bitrate == rhs.send_bitrate &&
          probe_cluster_id == rhs.probe_cluster_id &&
          probe_cluster_min_probes == rhs.probe_cluster_min_probes &&
          probe_cluster_min_bytes == rhs.probe_cluster_min_bytes;
diff --git a/api/transport/network_types.h b/api/transport/network_types.h
index a62c350474..b8ef4e938b 100644
--- a/api/transport/network_types.h
+++ b/api/transport/network_types.h
@@ -93,7 +93,7 @@ struct PacedPacketInfo {
 
   // TODO(srte): Move probing info to a separate, optional struct.
   static constexpr int kNotAProbe = -1;
-  int send_bitrate_bps = -1;
+  DataRate send_bitrate = DataRate::BitsPerSec(0);
   int probe_cluster_id = kNotAProbe;
   int probe_cluster_min_probes = -1;
   int probe_cluster_min_bytes = -1;
diff --git a/modules/pacing/bitrate_prober.cc b/modules/pacing/bitrate_prober.cc
index 3151a35075..e60a1e5283 100644
--- a/modules/pacing/bitrate_prober.cc
+++ b/modules/pacing/bitrate_prober.cc
@@ -97,7 +97,7 @@ void BitrateProber::CreateProbeCluster(
       (cluster_config.target_data_rate * cluster_config.target_duration)
           .bytes();
   RTC_DCHECK_GE(cluster.pace_info.probe_cluster_min_bytes, 0);
-  cluster.pace_info.send_bitrate_bps = cluster_config.target_data_rate.bps();
+  cluster.pace_info.send_bitrate = cluster_config.target_data_rate;
   cluster.pace_info.probe_cluster_id = cluster_config.id;
   clusters_.push(cluster);
 
@@ -109,7 +109,7 @@ void BitrateProber::CreateProbeCluster(
              probing_state_ == ProbingState::kInactive);
 
   RTC_LOG(LS_INFO) << "Probe cluster (bitrate_bps:min bytes:min packets): ("
-                   << cluster.pace_info.send_bitrate_bps << ":"
+                   << cluster.pace_info.send_bitrate << ":"
                    << cluster.pace_info.probe_cluster_min_bytes << ":"
                    << cluster.pace_info.probe_cluster_min_probes << ", "
                    << (probing_state_ == ProbingState::kInactive ? "Inactive"
@@ -153,8 +153,7 @@ DataSize BitrateProber::RecommendedMinProbeSize() const {
   if (clusters_.empty()) {
     return DataSize::Zero();
   }
-  DataRate send_rate =
-      DataRate::BitsPerSec(clusters_.front().pace_info.send_bitrate_bps);
+  DataRate send_rate = clusters_.front().pace_info.send_bitrate;
   return send_rate * config_.min_probe_delta;
 }
 
@@ -183,14 +182,13 @@ void BitrateProber::ProbeSent(Timestamp now, DataSize size) {
 
 Timestamp BitrateProber::CalculateNextProbeTime(
     const ProbeCluster& cluster) const {
-  RTC_CHECK_GT(cluster.pace_info.send_bitrate_bps, 0);
+  RTC_CHECK_GT(cluster.pace_info.send_bitrate.bps(), 0);
   RTC_CHECK(cluster.started_at.IsFinite());
 
   // Compute the time delta from the cluster start to ensure probe bitrate stays
   // close to the target bitrate. Result is in milliseconds.
   DataSize sent_bytes = DataSize::Bytes(cluster.sent_bytes);
-  DataRate send_bitrate =
-      DataRate::BitsPerSec(cluster.pace_info.send_bitrate_bps);
+  DataRate send_bitrate = cluster.pace_info.send_bitrate;
 
   TimeDelta delta = sent_bytes / send_bitrate;
   return cluster.started_at + delta;
diff --git a/rtc_tools/rtc_event_log_visualizer/log_simulation.cc b/rtc_tools/rtc_event_log_visualizer/log_simulation.cc
index 4c6c329c97..2ef40e62bf 100644
--- a/rtc_tools/rtc_event_log_visualizer/log_simulation.cc
+++ b/rtc_tools/rtc_event_log_visualizer/log_simulation.cc
@@ -72,7 +72,7 @@ void LogBasedNetworkControllerSimulation::OnPacketSent(
         packet.media_type == LoggedMediaType::kVideo) {
       auto& probe = pending_probes_.front();
       probe_info.probe_cluster_id = probe.event.id;
-      probe_info.send_bitrate_bps = probe.event.bitrate_bps;
+      probe_info.send_bitrate = DataRate::BitsPerSec(probe.event.bitrate_bps);
       probe_info.probe_cluster_min_bytes = probe.event.min_bytes;
       probe_info.probe_cluster_min_probes = probe.event.min_packets;
       probe.packets_sent++;