Cleanups in ChromotingClient

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 "remoting/base/constants.h"
 #include "remoting/jingle_glue/signal_strategy.h"
 #include "remoting/protocol/audio_reader.h"
 #include "remoting/protocol/audio_stub.h"
 #include "remoting/protocol/auth_util.h"
 #include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/client_control_dispatcher.h"
 #include "remoting/protocol/client_event_dispatcher.h"
 #include "remoting/protocol/client_stub.h"
 #include "remoting/protocol/clipboard_stub.h"
 #include "remoting/protocol/errors.h"
 #include "remoting/protocol/jingle_session_manager.h"
 #include "remoting/protocol/transport.h"
 #include "remoting/protocol/video_reader.h"
 #include "remoting/protocol/video_stub.h"
 
 namespace remoting {
 namespace protocol {
 
-ConnectionToHost::ConnectionToHost(
-    bool allow_nat_traversal)
-    : allow_nat_traversal_(allow_nat_traversal),
-      event_callback_(NULL),
+ConnectionToHost::ConnectionToHost()
+    : event_callback_(NULL),
       client_stub_(NULL),
       clipboard_stub_(NULL),
       audio_stub_(NULL),
       signal_strategy_(NULL),
       state_(INITIALIZING),
       error_(OK) {
 }
 
 ConnectionToHost::~ConnectionToHost() {
   CloseChannels();
 
   if (session_.get())
     session_.reset();
 
   if (session_manager_.get())
     session_manager_.reset();
 
   if (signal_strategy_)
     signal_strategy_->RemoveListener(this);
 }
 
 void ConnectionToHost::Connect(SignalStrategy* signal_strategy,
                                scoped_ptr<TransportFactory> transport_factory,
                                scoped_ptr<Authenticator> authenticator,
                                const std::string& host_jid,
-                               const std::string& host_public_key,
                                HostEventCallback* event_callback) {
   DCHECK(client_stub_);
   DCHECK(clipboard_stub_);
   DCHECK(monitored_video_stub_);
 
   signal_strategy_ = signal_strategy;
   event_callback_ = event_callback;
   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;
 
   signal_strategy_->AddListener(this);
   signal_strategy_->Connect();
 
   session_manager_.reset(new JingleSessionManager(transport_factory.Pass()));
   session_manager_->Init(signal_strategy_, this);
 
   SetState(CONNECTING, OK);
 }
 
@@ skipping 211 matching lines @@
 
   if (state != state_) {
     state_ = state;
     error_ = error;
     event_callback_->OnConnectionState(state_, error_);
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting