Move ConnectionToHost parameters out from Connect() call.

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"
@@ skipping 33 matching lines @@
   if (session_.get())
     session_.reset();
 
   if (session_manager_.get())
     session_manager_.reset();
 
   if (signal_strategy_)
     signal_strategy_->RemoveListener(this);
 }
 
-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(SignalStrategy* signal_strategy,
+                               scoped_ptr<TransportFactory> transport_factory,
+                               scoped_ptr<Authenticator> authenticator,
                                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,
-                               AudioStub* audio_stub) {
+                               HostEventCallback* event_callback) {
+  DCHECK(client_stub_);
+  DCHECK(clipboard_stub_);
+  DCHECK(monitored_video_stub_);
+
   signal_strategy_ = signal_strategy;
   event_callback_ = event_callback;
-  client_stub_ = client_stub;
-  clipboard_stub_ = clipboard_stub;
-  monitored_video_stub_.reset(new MonitoredVideoStub(
-      video_stub,
-      base::TimeDelta::FromSeconds(
-          MonitoredVideoStub::kConnectivityCheckDelaySeconds),
-      base::Bind(&ConnectionToHost::OnVideoChannelStatus,
-                 base::Unretained(this))));
-  audio_stub_ = audio_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;
 
   signal_strategy_->AddListener(this);
   signal_strategy_->Connect();
 
   session_manager_.reset(new JingleSessionManager(transport_factory.Pass()));
   session_manager_->Init(signal_strategy_, this);
 
   SetState(CONNECTING, OK);
 }
 
 const SessionConfig& ConnectionToHost::config() {
   return session_->config();
 }
 
+ClipboardStub* ConnectionToHost::clipboard_forwarder() {
+  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::set_client_stub(ClientStub* client_stub) {
+  client_stub_ = client_stub;
+}
+
+void ConnectionToHost::set_clipboard_stub(ClipboardStub* clipboard_stub) {
+  clipboard_stub_ = clipboard_stub;
+}
+
+void ConnectionToHost::set_video_stub(VideoStub* video_stub) {
+  DCHECK(video_stub);
+  monitored_video_stub_.reset(new MonitoredVideoStub(
+      video_stub,
+      base::TimeDelta::FromSeconds(
+          MonitoredVideoStub::kConnectivityCheckDelaySeconds),
+      base::Bind(&ConnectionToHost::OnVideoChannelStatus,
+                 base::Unretained(this))));
+}
+
+void ConnectionToHost::set_audio_stub(AudioStub* audio_stub) {
+  audio_stub_ = audio_stub;
+}
+
 void ConnectionToHost::OnSignalStrategyStateChange(
     SignalStrategy::State state) {
   DCHECK(CalledOnValidThread());
   DCHECK(event_callback_);
 
   if (state == SignalStrategy::CONNECTED) {
     VLOG(1) << "Connected as: " << signal_strategy_->GetLocalJid();
   } else if (state == SignalStrategy::DISCONNECTED) {
     VLOG(1) << "Connection closed.";
     CloseOnError(SIGNALING_ERROR);
@@ skipping 160 matching lines @@
 
   if (state != state_) {
     state_ = state;
     error_ = error;
     event_callback_->OnConnectionState(state_, error_);
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting