Move ConnectionToHost parameters out from Connect() call.

remoting/client/chromoting_client.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/client/chromoting_client.h"
 
 #include "base/bind.h"
 #include "remoting/base/capabilities.h"
 #include "remoting/client/audio_decode_scheduler.h"
 #include "remoting/client/audio_player.h"
@@ skipping 48 matching lines @@
           config_.client_pairing_id,
           config_.client_paired_secret,
           config_.authentication_tag,
           config_.fetch_secret_callback,
           user_interface_->GetTokenFetcher(config_.host_public_key),
           config_.authentication_methods));
 
   // Create a WeakPtr to ourself for to use for all posted tasks.
   weak_ptr_ = weak_factory_.GetWeakPtr();
 
+  connection_->set_client_stub(this);
+  connection_->set_clipboard_stub(this);
+  connection_->set_video_stub(video_renderer_);
+  connection_->set_audio_stub(audio_decode_scheduler_.get());
+
   connection_->Connect(signal_strategy,
+                       transport_factory.Pass(),
+                       authenticator.Pass(),
                        config_.host_jid,
                        config_.host_public_key,
-                       transport_factory.Pass(),
-                       authenticator.Pass(),
-                       this,
-                       this,
-                       this,
-                       video_renderer_,
-                       audio_decode_scheduler_.get());
+                       this);
 }
 
 void ChromotingClient::SetCapabilities(
     const protocol::Capabilities& capabilities) {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   // Only accept the first |protocol::Capabilities| message.
   if (host_capabilities_received_) {
     LOG(WARNING) << "protocol::Capabilities has been received already.";
     return;
@@ skipping 90 matching lines @@
   if (connection_->config().SupportsCapabilities()) {
     VLOG(1) << "Client capabilities: " << config_.capabilities;
 
     protocol::Capabilities capabilities;
     capabilities.set_capabilities(config_.capabilities);
     connection_->host_stub()->SetCapabilities(capabilities);
   }
 }
 
 }  // namespace remoting