Switch client to Pepper UDP API instead of Transport API.

remoting/protocol/connection_to_host.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/protocol/connection_to_host.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/message_loop_proxy.h"
@@ skipping 11 matching lines @@
 #include "remoting/protocol/pepper_transport_factory.h"
 #include "remoting/protocol/video_reader.h"
 #include "remoting/protocol/video_stub.h"
 #include "remoting/protocol/util.h"
 
 namespace remoting {
 namespace protocol {
 
 ConnectionToHost::ConnectionToHost(
     base::MessageLoopProxy* message_loop,
     pp::Instance* pp_instance,

[Wez, 2012/05/02 22:32:33]

Remove this parameter?

[Sergey Ulanov, 2012/05/11 19:39:36]

Done.

     bool allow_nat_traversal)
     : message_loop_(message_loop),
-      pp_instance_(pp_instance),

[Wez, 2012/05/02 22:32:33]

Ouch; isn't ConnectionToHost too generic to have Pepper dependencies?

[Sergey Ulanov, 2012/05/11 19:39:36]

Maybe. We had some other pepper-specific code in /protocol, which will be gone
once I remove PepperTransportFactory.

       allow_nat_traversal_(allow_nat_traversal),
       event_callback_(NULL),
       client_stub_(NULL),
       clipboard_stub_(NULL),
       video_stub_(NULL),
       state_(CONNECTING),
       error_(OK) {
 }
 
 ConnectionToHost::~ConnectionToHost() {
 }
 
 ClipboardStub* ConnectionToHost::clipboard_stub() {
   return &clipboard_forwarder_;
 }
 
 HostStub* ConnectionToHost::host_stub() {
   // TODO(wez): Add a HostFilter class, equivalent to input filter.
   return control_dispatcher_.get();
 }
 
 InputStub* ConnectionToHost::input_stub() {
   return &event_forwarder_;
 }
 
 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,
                                ClipboardStub* clipboard_stub,
                                VideoStub* video_stub) {
   event_callback_ = event_callback;
   client_stub_ = client_stub;
   clipboard_stub_ = clipboard_stub;
   video_stub_ = video_stub;
   authenticator_ = authenticator.Pass();
 
   // Save jid of the host. The actual connection is created later after
   // |signal_strategy_| is connected.
   host_jid_ = host_jid;
   host_public_key_ = host_public_key;
 
   JavascriptSignalStrategy* strategy = new JavascriptSignalStrategy(local_jid);
   strategy->AttachXmppProxy(xmpp_proxy);
   signal_strategy_.reset(strategy);
   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);
 }
 
 void ConnectionToHost::Disconnect(const base::Closure& shutdown_task) {
   if (!message_loop_->BelongsToCurrentThread()) {
     message_loop_->PostTask(
         FROM_HERE, base::Bind(&ConnectionToHost::Disconnect,
                               base::Unretained(this), shutdown_task));
     return;
   }
@@ skipping 150 matching lines @@
 
   if (state != state_) {
     state_ = state;
     error_ = error;
     event_callback_->OnConnectionState(state_, error_);
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting