[Remoting Android] DisplayUpdaterFactory cleanups

remoting/client/jni/chromoting_jni_instance.cc

 // Copyright 2013 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/jni/chromoting_jni_instance.h"
 
 #include <android/log.h>
 #include <stdint.h>
 
 #include "base/bind.h"
@@ skipping 13 matching lines @@
 #include "remoting/client/jni/jni_pairing_secret_fetcher.h"
 #include "remoting/client/jni/jni_video_renderer.h"
 #include "remoting/protocol/chromium_port_allocator_factory.h"
 #include "remoting/protocol/chromium_socket_factory.h"
 #include "remoting/protocol/client_authentication_config.h"
 #include "remoting/protocol/frame_consumer.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/network_settings.h"
 #include "remoting/protocol/performance_tracker.h"
 #include "remoting/protocol/transport_context.h"
+#include "remoting/protocol/video_renderer.h"
 #include "remoting/signaling/server_log_entry.h"
 #include "ui/events/keycodes/dom/keycode_converter.h"
 
 namespace remoting {
 
 namespace {
 
 // TODO(solb) Move into location shared with client plugin.
 const char* const kXmppServer = "talk.google.com";
 const int kXmppPort = 5222;
 const bool kXmppUseTls = true;
 
 // Interval at which to log performance statistics, if enabled.
 const int kPerfStatsIntervalMs = 60000;
 
 }  // namespace
 
 ChromotingJniInstance::ChromotingJniInstance(
     ChromotingJniRuntime* jni_runtime,
     base::WeakPtr<JniClient> jni_client,
     base::WeakPtr<JniPairingSecretFetcher> secret_fetcher,
     std::unique_ptr<protocol::CursorShapeStub> cursor_shape_stub,
-    std::unique_ptr<JniVideoRenderer> video_renderer,
+    std::unique_ptr<protocol::VideoRenderer> video_renderer,
     const std::string& username,
     const std::string& auth_token,
     const std::string& host_jid,
     const std::string& host_id,
     const std::string& host_pubkey,
     const std::string& pairing_id,
     const std::string& pairing_secret,
     const std::string& capabilities,
     const std::string& flags)
     : jni_runtime_(jni_runtime),
@@ skipping 307 matching lines @@
 void ChromotingJniInstance::ConnectToHostOnNetworkThread() {
   DCHECK(jni_runtime_->network_task_runner()->BelongsToCurrentThread());
 
   jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop();
 
   client_context_.reset(new ClientContext(jni_runtime_->network_task_runner()));
   client_context_->Start();
 
   perf_tracker_.reset(new protocol::PerformanceTracker());
 
-  video_renderer_->Initialize(client_context_->decode_task_runner(),
+  video_renderer_->Initialize(*client_context_,
                               perf_tracker_.get());
 
   if (!audio_player_) {
     audio_player_.reset(new AudioPlayerAndroid());
   }
 
   client_.reset(new ChromotingClient(client_context_.get(), this,
                                      video_renderer_.get(),
                                      audio_player_->GetWeakPtr()));
 
@@ skipping 100 matching lines @@
   video_renderer_.reset();
   signaling_.reset();
   perf_tracker_.reset();
   client_context_.reset();
   cursor_shape_stub_.reset();
 
   weak_factory_.InvalidateWeakPtrs();
 }
 
 }  // namespace remoting