Update thread annotiation macros in modules to use RTC_ prefix

webrtc/modules/rtp_rtcp/source/rtcp_sender.h

Index: webrtc/modules/rtp_rtcp/source/rtcp_sender.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender.h b/webrtc/modules/rtp_rtcp/source/rtcp_sender.h
index ae06a17d8eef9b51328d20128cb0163c40bb1b5c..d581a044defaa15ffb997751ec509e9dc1bdbe2e 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_sender.h
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender.h
@@ -155,117 +155,119 @@ class RTCPSender {
 
   // Determine which RTCP messages should be sent and setup flags.
   void PrepareReport(const FeedbackState& feedback_state)
-      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
+      RTC_EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
 
   std::vector<rtcp::ReportBlock> CreateReportBlocks(
       const FeedbackState& feedback_state)
-      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
+      RTC_EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
 
   std::unique_ptr<rtcp::RtcpPacket> BuildSR(const RtcpContext& context)
-      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
+      RTC_EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
   std::unique_ptr<rtcp::RtcpPacket> BuildRR(const RtcpContext& context)
-      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
+      RTC_EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
   std::unique_ptr<rtcp::RtcpPacket> BuildSDES(const RtcpContext& context)
-      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
+      RTC_EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
   std::unique_ptr<rtcp::RtcpPacket> BuildPLI(const RtcpContext& context)
-      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
+      RTC_EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
   std::unique_ptr<rtcp::RtcpPacket> BuildREMB(const RtcpContext& context)
-      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
+      RTC_EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
   std::unique_ptr<rtcp::RtcpPacket> BuildTMMBR(const RtcpContext& context)
-      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
+      RTC_EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
   std::unique_ptr<rtcp::RtcpPacket> BuildTMMBN(const RtcpContext& context)
-      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
+      RTC_EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
   std::unique_ptr<rtcp::RtcpPacket> BuildAPP(const RtcpContext& context)
-      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
+      RTC_EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
   std::unique_ptr<rtcp::RtcpPacket> BuildExtendedReports(
       const RtcpContext& context)
-      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
+      RTC_EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
   std::unique_ptr<rtcp::RtcpPacket> BuildBYE(const RtcpContext& context)
-      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
+      RTC_EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
   std::unique_ptr<rtcp::RtcpPacket> BuildFIR(const RtcpContext& context)
-      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
+      RTC_EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
   std::unique_ptr<rtcp::RtcpPacket> BuildNACK(const RtcpContext& context)
-      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
+      RTC_EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
 
  private:
   const bool audio_;
   Clock* const clock_;
-  Random random_ GUARDED_BY(critical_section_rtcp_sender_);
-  RtcpMode method_ GUARDED_BY(critical_section_rtcp_sender_);
+  Random random_ RTC_GUARDED_BY(critical_section_rtcp_sender_);
+  RtcpMode method_ RTC_GUARDED_BY(critical_section_rtcp_sender_);
 
   RtcEventLog* const event_log_;
   Transport* const transport_;
 
   rtc::CriticalSection critical_section_rtcp_sender_;
-  bool using_nack_ GUARDED_BY(critical_section_rtcp_sender_);
-  bool sending_ GUARDED_BY(critical_section_rtcp_sender_);
-  bool remb_enabled_ GUARDED_BY(critical_section_rtcp_sender_);
+  bool using_nack_ RTC_GUARDED_BY(critical_section_rtcp_sender_);
+  bool sending_ RTC_GUARDED_BY(critical_section_rtcp_sender_);
+  bool remb_enabled_ RTC_GUARDED_BY(critical_section_rtcp_sender_);
 
-  int64_t next_time_to_send_rtcp_ GUARDED_BY(critical_section_rtcp_sender_);
+  int64_t next_time_to_send_rtcp_ RTC_GUARDED_BY(critical_section_rtcp_sender_);
 
-  uint32_t timestamp_offset_ GUARDED_BY(critical_section_rtcp_sender_);
-  uint32_t last_rtp_timestamp_ GUARDED_BY(critical_section_rtcp_sender_);
-  int64_t last_frame_capture_time_ms_ GUARDED_BY(critical_section_rtcp_sender_);
-  uint32_t ssrc_ GUARDED_BY(critical_section_rtcp_sender_);
+  uint32_t timestamp_offset_ RTC_GUARDED_BY(critical_section_rtcp_sender_);
+  uint32_t last_rtp_timestamp_ RTC_GUARDED_BY(critical_section_rtcp_sender_);
+  int64_t last_frame_capture_time_ms_
+      RTC_GUARDED_BY(critical_section_rtcp_sender_);
+  uint32_t ssrc_ RTC_GUARDED_BY(critical_section_rtcp_sender_);
   // SSRC that we receive on our RTP channel
-  uint32_t remote_ssrc_ GUARDED_BY(critical_section_rtcp_sender_);
-  std::string cname_ GUARDED_BY(critical_section_rtcp_sender_);
+  uint32_t remote_ssrc_ RTC_GUARDED_BY(critical_section_rtcp_sender_);
+  std::string cname_ RTC_GUARDED_BY(critical_section_rtcp_sender_);
 
   ReceiveStatisticsProvider* receive_statistics_
-      GUARDED_BY(critical_section_rtcp_sender_);
+      RTC_GUARDED_BY(critical_section_rtcp_sender_);
   std::map<uint32_t, std::string> csrc_cnames_
-      GUARDED_BY(critical_section_rtcp_sender_);
+      RTC_GUARDED_BY(critical_section_rtcp_sender_);
 
   // send CSRCs
-  std::vector<uint32_t> csrcs_ GUARDED_BY(critical_section_rtcp_sender_);
+  std::vector<uint32_t> csrcs_ RTC_GUARDED_BY(critical_section_rtcp_sender_);
 
   // Full intra request
-  uint8_t sequence_number_fir_ GUARDED_BY(critical_section_rtcp_sender_);
+  uint8_t sequence_number_fir_ RTC_GUARDED_BY(critical_section_rtcp_sender_);
 
   // REMB
-  uint32_t remb_bitrate_ GUARDED_BY(critical_section_rtcp_sender_);
-  std::vector<uint32_t> remb_ssrcs_ GUARDED_BY(critical_section_rtcp_sender_);
+  uint32_t remb_bitrate_ RTC_GUARDED_BY(critical_section_rtcp_sender_);
+  std::vector<uint32_t> remb_ssrcs_
+      RTC_GUARDED_BY(critical_section_rtcp_sender_);
 
   std::vector<rtcp::TmmbItem> tmmbn_to_send_
-      GUARDED_BY(critical_section_rtcp_sender_);
-  uint32_t tmmbr_send_bps_ GUARDED_BY(critical_section_rtcp_sender_);
-  uint32_t packet_oh_send_ GUARDED_BY(critical_section_rtcp_sender_);
-  size_t max_packet_size_ GUARDED_BY(critical_section_rtcp_sender_);
+      RTC_GUARDED_BY(critical_section_rtcp_sender_);
+  uint32_t tmmbr_send_bps_ RTC_GUARDED_BY(critical_section_rtcp_sender_);
+  uint32_t packet_oh_send_ RTC_GUARDED_BY(critical_section_rtcp_sender_);
+  size_t max_packet_size_ RTC_GUARDED_BY(critical_section_rtcp_sender_);
 
   // APP
-  uint8_t app_sub_type_ GUARDED_BY(critical_section_rtcp_sender_);
-  uint32_t app_name_ GUARDED_BY(critical_section_rtcp_sender_);
+  uint8_t app_sub_type_ RTC_GUARDED_BY(critical_section_rtcp_sender_);
+  uint32_t app_name_ RTC_GUARDED_BY(critical_section_rtcp_sender_);
   std::unique_ptr<uint8_t[]> app_data_
-      GUARDED_BY(critical_section_rtcp_sender_);
-  uint16_t app_length_ GUARDED_BY(critical_section_rtcp_sender_);
+      RTC_GUARDED_BY(critical_section_rtcp_sender_);
+  uint16_t app_length_ RTC_GUARDED_BY(critical_section_rtcp_sender_);
 
   // True if sending of XR Receiver reference time report is enabled.
   bool xr_send_receiver_reference_time_enabled_
-      GUARDED_BY(critical_section_rtcp_sender_);
+      RTC_GUARDED_BY(critical_section_rtcp_sender_);
 
   // XR VoIP metric
   rtc::Optional<RTCPVoIPMetric> xr_voip_metric_
-      GUARDED_BY(critical_section_rtcp_sender_);
+      RTC_GUARDED_BY(critical_section_rtcp_sender_);
 
   RtcpPacketTypeCounterObserver* const packet_type_counter_observer_;
   RtcpPacketTypeCounter packet_type_counter_
-      GUARDED_BY(critical_section_rtcp_sender_);
+      RTC_GUARDED_BY(critical_section_rtcp_sender_);
 
-  RtcpNackStats nack_stats_ GUARDED_BY(critical_section_rtcp_sender_);
+  RtcpNackStats nack_stats_ RTC_GUARDED_BY(critical_section_rtcp_sender_);
 
   rtc::Optional<BitrateAllocation> video_bitrate_allocation_
-      GUARDED_BY(critical_section_rtcp_sender_);
+      RTC_GUARDED_BY(critical_section_rtcp_sender_);
 
   void SetFlag(uint32_t type, bool is_volatile)
-      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
+      RTC_EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
   void SetFlags(const std::set<RTCPPacketType>& types, bool is_volatile)
-      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
+      RTC_EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
   bool IsFlagPresent(uint32_t type) const
-      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
+      RTC_EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
   bool ConsumeFlag(uint32_t type, bool forced = false)
-      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
+      RTC_EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
   bool AllVolatileFlagsConsumed() const
-      EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
+      RTC_EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
   struct ReportFlag {
     ReportFlag(uint32_t type, bool is_volatile)
         : type(type), is_volatile(is_volatile) {}
@@ -275,7 +277,8 @@ class RTCPSender {
     const bool is_volatile;
   };
 
-  std::set<ReportFlag> report_flags_ GUARDED_BY(critical_section_rtcp_sender_);
+  std::set<ReportFlag> report_flags_
+      RTC_GUARDED_BY(critical_section_rtcp_sender_);
 
   typedef std::unique_ptr<rtcp::RtcpPacket> (RTCPSender::*BuilderFunc)(
       const RtcpContext&);