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

Unified Diff: remoting/protocol/transport_context.cc

Issue 1707223002: Implement HttpIceConfigRequest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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/transport_context.h ('k') | remoting/remoting_srcs.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/transport_context.cc
diff --git a/remoting/protocol/transport_context.cc b/remoting/protocol/transport_context.cc
index d75e403e26134b4c7f0c05d19d8d21d42a14231c..70c8b9661aa1cec2bfbb54d261a22407b7dee788 100644
--- a/remoting/protocol/transport_context.cc
+++ b/remoting/protocol/transport_context.cc
@@ -11,6 +11,7 @@
#include "base/single_thread_task_runner.h"
#include "base/thread_task_runner_handle.h"
#include "remoting/base/url_request.h"
+#include "remoting/protocol/http_ice_config_request.h"
#include "remoting/protocol/jingle_info_request.h"
#include "remoting/protocol/port_allocator_factory.h"
#include "third_party/webrtc/base/socketaddress.h"
@@ -79,7 +80,12 @@ void TransportContext::EnsureFreshJingleInfo() {
if (ice_config_.is_null() ||
base::Time::Now() > ice_config_.expiration_time) {
- ice_config_request_.reset(new JingleInfoRequest(signal_strategy_));
+ if (!ice_config_url_.empty()) {
+ ice_config_request_.reset(new HttpIceConfigRequest(
+ url_request_factory_.get(), ice_config_url_));
+ } else {
+ ice_config_request_.reset(new JingleInfoRequest(signal_strategy_));
+ }
ice_config_request_->Send(base::Bind(
&TransportContext::OnIceConfig, base::Unretained(this)));
}
« no previous file with comments | « remoting/protocol/transport_context.h ('k') | remoting/remoting_srcs.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698