Index: webrtc/p2p/base/faketransportcontroller.h |
diff --git a/webrtc/p2p/base/faketransportcontroller.h b/webrtc/p2p/base/faketransportcontroller.h |
index c099c8cb796e1f132578a39631fe87670b3d434c..433c2cd32b3643f891060ba22b75de7c3e89a49d 100644 |
--- a/webrtc/p2p/base/faketransportcontroller.h |
+++ b/webrtc/p2p/base/faketransportcontroller.h |
@@ -213,7 +213,7 @@ class FakeTransportChannel : public TransportChannelImpl, |
} |
int SetOption(rtc::Socket::Option opt, int value) override { return true; } |
bool GetOption(rtc::Socket::Option opt, int* value) override { return true; } |
- int GetError() override { return 0; } |
+ int GetError() override { return -1; } |
void AddRemoteCandidate(const Candidate& candidate) override { |
remote_candidates_.push_back(candidate); |
@@ -503,22 +503,22 @@ class FakeTransportController : public TransportController { |
SetIceRole(role); |
} |
- FakeTransport* GetTransport_w(const std::string& transport_name) { |
+ FakeTransport* GetTransport_n(const std::string& transport_name) { |
return static_cast<FakeTransport*>( |
- TransportController::GetTransport_w(transport_name)); |
+ TransportController::GetTransport_n(transport_name)); |
} |
void Connect(FakeTransportController* dest) { |
- worker_thread()->Invoke<void>( |
- rtc::Bind(&FakeTransportController::Connect_w, this, dest)); |
+ network_thread()->Invoke<void>( |
+ rtc::Bind(&FakeTransportController::Connect_n, this, dest)); |
} |
- TransportChannel* CreateTransportChannel_w(const std::string& transport_name, |
+ TransportChannel* CreateTransportChannel_n(const std::string& transport_name, |
int component) override { |
if (fail_create_channel_) { |
return nullptr; |
} |
- return TransportController::CreateTransportChannel_w(transport_name, |
+ return TransportController::CreateTransportChannel_n(transport_name, |
component); |
} |
@@ -539,21 +539,21 @@ class FakeTransportController : public TransportController { |
} |
protected: |
- Transport* CreateTransport_w(const std::string& transport_name) override { |
+ Transport* CreateTransport_n(const std::string& transport_name) override { |
return new FakeTransport(transport_name); |
} |
- void Connect_w(FakeTransportController* dest) { |
+ void Connect_n(FakeTransportController* dest) { |
// Simulate the exchange of candidates. |
- ConnectChannels_w(); |
- dest->ConnectChannels_w(); |
+ ConnectChannels_n(); |
+ dest->ConnectChannels_n(); |
for (auto& kv : transports()) { |
FakeTransport* transport = static_cast<FakeTransport*>(kv.second); |
- transport->SetDestination(dest->GetTransport_w(kv.first)); |
+ transport->SetDestination(dest->GetTransport_n(kv.first)); |
} |
} |
- void ConnectChannels_w() { |
+ void ConnectChannels_n() { |
TransportDescription faketransport_desc( |
std::vector<std::string>(), |
rtc::CreateRandomString(cricket::ICE_UFRAG_LENGTH), |