Index: webrtc/pc/channel.h |
diff --git a/webrtc/pc/channel.h b/webrtc/pc/channel.h |
index df75245f276d039b7af827f3470eda152a0c4e18..1b634e4d48132172a66ddfb77b44ea1fed4148c3 100644 |
--- a/webrtc/pc/channel.h |
+++ b/webrtc/pc/channel.h |
@@ -24,6 +24,7 @@ |
#include "webrtc/base/criticalsection.h" |
#include "webrtc/base/network.h" |
#include "webrtc/base/sigslot.h" |
+#include "webrtc/base/thread_scope.h" |
#include "webrtc/base/window.h" |
#include "webrtc/media/base/mediachannel.h" |
#include "webrtc/media/base/mediaengine.h" |
@@ -174,7 +175,8 @@ class BaseChannel |
// true). Gets the transport channels from |transport_controller_|. |
bool SetTransport_n(const std::string& transport_name); |
- void SetTransportChannel_n(TransportChannel* transport); |
+ void SetTransportChannel_n(TransportChannel* transport) |
+ RTC_MUST_RUN_ON(network_thread_); |
void SetRtcpTransportChannel_n(TransportChannel* transport, |
bool update_writablity); |
@@ -330,7 +332,7 @@ class BaseChannel |
// Transport related members that should be accessed from network thread. |
TransportController* const transport_controller_; |
- std::string transport_name_; |
+ std::string transport_name_ RTC_MUST_BE_ACCESSED_FROM(network_thread_); |
bool rtcp_transport_enabled_; |
TransportChannel* transport_channel_; |
std::vector<std::pair<rtc::Socket::Option, int> > socket_options_; |