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

Unified Diff: remoting/client/plugin/chromoting_instance.cc

Issue 1521883006: Add TransportContext class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/client/jni/chromoting_jni_instance.cc ('k') | remoting/client/plugin/pepper_port_allocator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/plugin/chromoting_instance.cc
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index 13fe3422893fa39868f578f3f2f6dc2ed2a52d8a..93918de27e1848afac47ffcd9edf458175d547bb 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -52,7 +52,7 @@
#include "remoting/client/token_fetcher_proxy.h"
#include "remoting/protocol/connection_to_host.h"
#include "remoting/protocol/host_stub.h"
-#include "remoting/protocol/ice_transport_factory.h"
+#include "remoting/protocol/transport_context.h"
#include "url/gurl.h"
namespace remoting {
@@ -693,10 +693,11 @@ void ChromotingInstance::HandleConnect(const base::DictionaryValue& data) {
local_jid, base::Bind(&ChromotingInstance::SendOutgoingIq,
weak_factory_.GetWeakPtr())));
- // Create TransportFactory.
- scoped_ptr<protocol::TransportFactory> transport_factory(
- new protocol::IceTransportFactory(
- signal_strategy_.get(), PepperPortAllocator::Create(this).Pass(),
+ // Create TransportContext.
+ scoped_refptr<protocol::TransportContext> transport_context(
+ new protocol::TransportContext(
+ signal_strategy_.get(),
+ make_scoped_ptr(new PepperPortAllocatorFactory(this)),
protocol::NetworkSettings(
protocol::NetworkSettings::NAT_TRAVERSAL_FULL),
protocol::TransportRole::CLIENT));
@@ -731,7 +732,7 @@ void ChromotingInstance::HandleConnect(const base::DictionaryValue& data) {
// Kick off the connection.
client_->Start(signal_strategy_.get(), authenticator.Pass(),
- transport_factory.Pass(), host_jid, capabilities);
+ transport_context, host_jid, capabilities);
// Start timer that periodically sends perf stats.
stats_update_timer_.Start(
« no previous file with comments | « remoting/client/jni/chromoting_jni_instance.cc ('k') | remoting/client/plugin/pepper_port_allocator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698