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

Unified Diff: remoting/protocol/connection_to_host.cc

Issue 6623048: Replace libjingle's HttpPortAllocatorSession with Pepper's http client (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: thread switching Created 9 years, 9 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
Index: remoting/protocol/connection_to_host.cc
diff --git a/remoting/protocol/connection_to_host.cc b/remoting/protocol/connection_to_host.cc
index 2ef3a229ed8368f7519abc9dada2c7f6c4f32ccb..ce866557023f2bbe1c119c90bb10d3187b20c42a 100644
--- a/remoting/protocol/connection_to_host.cc
+++ b/remoting/protocol/connection_to_host.cc
@@ -7,6 +7,7 @@
#include "base/callback.h"
#include "base/message_loop.h"
#include "remoting/base/constants.h"
+#include "remoting/jingle_glue/http_port_allocator.h"
#include "remoting/jingle_glue/jingle_thread.h"
#include "remoting/proto/auth.pb.h"
#include "remoting/protocol/client_message_dispatcher.h"
@@ -24,11 +25,13 @@ namespace protocol {
ConnectionToHost::ConnectionToHost(
JingleThread* thread,
talk_base::NetworkManager* network_manager,
- talk_base::PacketSocketFactory* socket_factory)
+ talk_base::PacketSocketFactory* socket_factory,
+ PortAllocatorSessionFactory* session_factory)
: client_authenticated_(false),
thread_(thread),
network_manager_(network_manager),
socket_factory_(socket_factory),
+ port_allocator_session_factory_(session_factory),
event_callback_(NULL),
dispatcher_(new ClientMessageDispatcher()) {
}
@@ -67,9 +70,10 @@ void ConnectionToHost::Connect(const std::string& username,
kChromotingTokenServiceName));
}
- jingle_client_ = new JingleClient(thread_, signal_strategy_.get(),
- network_manager_.release(),
- socket_factory_.release(), this);
+ jingle_client_ = new JingleClient(
+ thread_, signal_strategy_.get(), network_manager_.release(),
+ socket_factory_.release(), port_allocator_session_factory_.release(),
+ this);
jingle_client_->Init();
// Save jid of the host. The actual connection is created later after

Powered by Google App Engine
This is Rietveld 408576698