Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(175)

Unified Diff: remoting/protocol/pepper_transport_factory.cc

Issue 10233021: Move PortAllocator creation out of LibjingleTransportFactory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/protocol/libjingle_transport_factory.cc ('k') | remoting/protocol/session_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/pepper_transport_factory.cc
diff --git a/remoting/protocol/pepper_transport_factory.cc b/remoting/protocol/pepper_transport_factory.cc
index 0b0e5275f1796a9ad596a508bc51db0743d55c63..f593dfc3acac49134e4460fdbbe5b3439e9815e5 100644
--- a/remoting/protocol/pepper_transport_factory.cc
+++ b/remoting/protocol/pepper_transport_factory.cc
@@ -149,36 +149,34 @@ void PepperStreamTransport::Connect(
LOG(ERROR) << "Failed to set TCP ACK delay.";
}
- if (config_.nat_traversal_mode == TransportConfig::NAT_TRAVERSAL_ENABLED) {
- if (transport->SetProperty(
- PP_TRANSPORTPROPERTY_STUN_SERVER,
- pp::Var(config_.stun_server)) != PP_OK) {
- LOG(ERROR) << "Failed to set STUN server.";
- }
-
- if (transport->SetProperty(
- PP_TRANSPORTPROPERTY_RELAY_SERVER,
- pp::Var(config_.relay_server)) != PP_OK) {
- LOG(ERROR) << "Failed to set relay server.";
- }
-
- if (transport->SetProperty(
- PP_TRANSPORTPROPERTY_RELAY_USERNAME,
- pp::Var("1")) != PP_OK) {
- LOG(ERROR) << "Failed to set relay username.";
- }
-
- if (transport->SetProperty(
- PP_TRANSPORTPROPERTY_RELAY_PASSWORD,
- pp::Var(config_.relay_token)) != PP_OK) {
- LOG(ERROR) << "Failed to set relay token.";
- }
-
- if (transport->SetProperty(
- PP_TRANSPORTPROPERTY_RELAY_MODE,
- pp::Var(PP_TRANSPORTRELAYMODE_GOOGLE)) != PP_OK) {
- LOG(ERROR) << "Failed to set relay mode.";
- }
+ if (transport->SetProperty(
+ PP_TRANSPORTPROPERTY_STUN_SERVER,
+ pp::Var(config_.stun_server)) != PP_OK) {
+ LOG(ERROR) << "Failed to set STUN server.";
+ }
+
+ if (transport->SetProperty(
+ PP_TRANSPORTPROPERTY_RELAY_SERVER,
+ pp::Var(config_.relay_server)) != PP_OK) {
+ LOG(ERROR) << "Failed to set relay server.";
+ }
+
+ if (transport->SetProperty(
+ PP_TRANSPORTPROPERTY_RELAY_USERNAME,
+ pp::Var("1")) != PP_OK) {
+ LOG(ERROR) << "Failed to set relay username.";
+ }
+
+ if (transport->SetProperty(
+ PP_TRANSPORTPROPERTY_RELAY_PASSWORD,
+ pp::Var(config_.relay_token)) != PP_OK) {
+ LOG(ERROR) << "Failed to set relay token.";
+ }
+
+ if (transport->SetProperty(
+ PP_TRANSPORTPROPERTY_RELAY_MODE,
+ pp::Var(PP_TRANSPORTRELAYMODE_GOOGLE)) != PP_OK) {
+ LOG(ERROR) << "Failed to set relay mode.";
}
if (transport->SetProperty(PP_TRANSPORTPROPERTY_DISABLE_TCP_TRANSPORT,
« no previous file with comments | « remoting/protocol/libjingle_transport_factory.cc ('k') | remoting/protocol/session_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698