Adding the base ChromotingInstance implementation and unittests. This class will be used by the ap…

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 15 matching lines @@
 
 ChromotingClient::ChromotingClient(
     ClientContext* client_context,
     ClientUserInterface* user_interface,
     VideoRenderer* video_renderer,
     scoped_ptr<AudioPlayer> audio_player)
     : task_runner_(client_context->main_task_runner()),
       user_interface_(user_interface),
       video_renderer_(video_renderer),
       host_capabilities_received_(false) {
+  connection_.reset(new protocol::ConnectionToHost());

[Sergey Ulanov, 2015/03/09 06:44:40]

this should be in the initializer list above, but I think it's better to move it
to Start().

[joedow, 2015/03/09 21:09:25]

The problem with moving this code to start is that the user of the class may
want to call SetProtocolConfigForTests() before calling Start() and then
connection_ will not be defined.  I've added it to the initialized list as I
think that is the safest solution and creating a ConnectionToHost that will be
overwritten by some tests seems like a reasonable trade-off.

   if (audio_player) {
     audio_decode_scheduler_.reset(new AudioDecodeScheduler(
         client_context->main_task_runner(),
         client_context->audio_decode_task_runner(),
         audio_player.Pass()));
   }
 }
 
 ChromotingClient::~ChromotingClient() {}
 
 void ChromotingClient::SetProtocolConfigForTests(
     scoped_ptr<protocol::CandidateSessionConfig> config) {
-  connection_.set_candidate_config(config.Pass());
+  connection_->set_candidate_config(config.Pass());
+}
+
+void ChromotingClient::SetConnectionToHostForTests(
+    scoped_ptr<protocol::ConnectionToHost> connection_to_host) {
+  connection_ = connection_to_host.Pass();
 }
 
 void ChromotingClient::Start(
     SignalStrategy* signal_strategy,
     scoped_ptr<protocol::Authenticator> authenticator,
     scoped_ptr<protocol::TransportFactory> transport_factory,
     const std::string& host_jid,
     const std::string& capabilities) {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   local_capabilities_ = capabilities;
 
-  connection_.set_client_stub(this);
-  connection_.set_clipboard_stub(this);
-  connection_.set_video_stub(video_renderer_->GetVideoStub());
-  connection_.set_audio_stub(audio_decode_scheduler_.get());
+  connection_->set_client_stub(this);
+  connection_->set_clipboard_stub(this);
+  connection_->set_video_stub(video_renderer_->GetVideoStub());
+  connection_->set_audio_stub(audio_decode_scheduler_.get());
 
-  connection_.Connect(signal_strategy, transport_factory.Pass(),
+  connection_->Connect(signal_strategy, transport_factory.Pass(),
                        authenticator.Pass(), host_jid, 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.";
@@ skipping 63 matching lines @@
                                       const protocol::TransportRoute& route) {
   VLOG(0) << "Using " << protocol::TransportRoute::GetTypeString(route.type)
           << " connection for " << channel_name << " channel";
   user_interface_->OnRouteChanged(channel_name, route);
 }
 
 void ChromotingClient::OnAuthenticated() {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   // Initialize the decoder.
-  video_renderer_->OnSessionConfig(connection_.config());
-  if (connection_.config().is_audio_enabled())
-    audio_decode_scheduler_->Initialize(connection_.config());
-
+  video_renderer_->OnSessionConfig(connection_->config());
+  if (connection_->config().is_audio_enabled())
+    audio_decode_scheduler_->Initialize(connection_->config());
 }
 
 void ChromotingClient::OnChannelsConnected() {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   // Negotiate capabilities with the host.
   VLOG(1) << "Client capabilities: " << local_capabilities_;
 
   protocol::Capabilities capabilities;
   capabilities.set_capabilities(local_capabilities_);
-  connection_.host_stub()->SetCapabilities(capabilities);
+  connection_->host_stub()->SetCapabilities(capabilities);
 }
 
 }  // namespace remoting