ThreadScope concept to check variable accessed on correct thread

webrtc/p2p/stunprober/stunprober.cc

Index: webrtc/p2p/stunprober/stunprober.cc
diff --git a/webrtc/p2p/stunprober/stunprober.cc b/webrtc/p2p/stunprober/stunprober.cc
index 90dc60e1514a8f25556f1bdb68d181859c17729e..df5cdb27e1fe5b53a83cf2ad5e9ac2ec3822bf0a 100644
--- a/webrtc/p2p/stunprober/stunprober.cc
+++ b/webrtc/p2p/stunprober/stunprober.cc
@@ -22,6 +22,7 @@
 #include "webrtc/base/logging.h"
 #include "webrtc/base/timeutils.h"
 #include "webrtc/base/thread.h"
+#include "webrtc/base/thread_scope.h"
 #include "webrtc/p2p/base/packetsocketfactory.h"
 #include "webrtc/p2p/base/stun.h"
 #include "webrtc/p2p/stunprober/stunprober.h"
@@ -97,7 +98,7 @@ class StunProber::Requester : public sigslot::has_slots<> {
   rtc::SocketAddress addr_;
   std::unique_ptr<rtc::ByteBufferWriter> response_packet_;
 
-  std::vector<Request*> requests_;
+  std::vector<Request*> requests_ GUARDED_BY(thread_checker_);
   std::vector<rtc::SocketAddress> server_ips_;
   int16_t num_request_sent_ = 0;
   int16_t num_response_received_ = 0;
@@ -132,7 +133,7 @@ StunProber::Requester::~Requester() {
 }
 
 void StunProber::Requester::SendStunRequest() {
-  RTC_DCHECK(thread_checker_.CalledOnValidThread());
+  RTC_DCHECK_RUN_ON(&thread_checker_);
   requests_.push_back(new Request());
   Request& request = *(requests_.back());
   cricket::StunMessage message;
@@ -219,7 +220,7 @@ void StunProber::Requester::OnStunResponseReceived(
 
 StunProber::Requester::Request* StunProber::Requester::GetRequestByAddress(
     const rtc::IPAddress& ipaddr) {
-  RTC_DCHECK(thread_checker_.CalledOnValidThread());
+  RTC_DCHECK_RUN_ON(&thread_checker_);
   for (auto request : requests_) {
     if (request->server_addr == ipaddr) {
       return request;