summaryrefslogtreecommitdiffstats
path: root/remoting/protocol/connection_to_host.cc
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-11 22:23:36 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-11 22:23:36 +0000
commit3b2109ae1f15a87df412995ab61691d901487b65 (patch)
tree9159f0e2c3eb6665cdaaaadf78b16eb28c1628e9 /remoting/protocol/connection_to_host.cc
parent077478b5a7391bc3ace75c2a0d84cb2f470a4d98 (diff)
downloadchromium_src-3b2109ae1f15a87df412995ab61691d901487b65.zip
chromium_src-3b2109ae1f15a87df412995ab61691d901487b65.tar.gz
chromium_src-3b2109ae1f15a87df412995ab61691d901487b65.tar.bz2
Switch client to Pepper UDP API instead of Transport API.
BUG=109630 Review URL: https://chromiumcodereview.appspot.com/10284008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136692 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/connection_to_host.cc')
-rw-r--r--remoting/protocol/connection_to_host.cc7
1 files changed, 2 insertions, 5 deletions
diff --git a/remoting/protocol/connection_to_host.cc b/remoting/protocol/connection_to_host.cc
index 802d010..25a8949 100644
--- a/remoting/protocol/connection_to_host.cc
+++ b/remoting/protocol/connection_to_host.cc
@@ -29,10 +29,8 @@ namespace protocol {
ConnectionToHost::ConnectionToHost(
base::MessageLoopProxy* message_loop,
- pp::Instance* pp_instance,
bool allow_nat_traversal)
: message_loop_(message_loop),
- pp_instance_(pp_instance),
allow_nat_traversal_(allow_nat_traversal),
event_callback_(NULL),
client_stub_(NULL),
@@ -62,6 +60,7 @@ void ConnectionToHost::Connect(scoped_refptr<XmppProxy> xmpp_proxy,
const std::string& local_jid,
const std::string& host_jid,
const std::string& host_public_key,
+ scoped_ptr<TransportFactory> transport_factory,
scoped_ptr<Authenticator> authenticator,
HostEventCallback* event_callback,
ClientStub* client_stub,
@@ -84,10 +83,8 @@ void ConnectionToHost::Connect(scoped_refptr<XmppProxy> xmpp_proxy,
signal_strategy_->AddListener(this);
signal_strategy_->Connect();
- scoped_ptr<TransportFactory> transport_factory(
- new PepperTransportFactory(pp_instance_));
session_manager_.reset(new JingleSessionManager(
- transport_factory.Pass(), true));
+ transport_factory.Pass(), allow_nat_traversal_));
session_manager_->Init(signal_strategy_.get(), this);
}