[Remoting Android] DisplayUpdaterFactory cleanups

remoting/client/jni/chromoting_jni_instance.h

 // 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.
 
 #ifndef REMOTING_CLIENT_JNI_CHROMOTING_JNI_INSTANCE_H_
 #define REMOTING_CLIENT_JNI_CHROMOTING_JNI_INSTANCE_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 10 matching lines @@
 #include "remoting/protocol/cursor_shape_stub.h"
 #include "remoting/signaling/xmpp_signal_strategy.h"
 
 namespace remoting {
 
 namespace protocol {
 class ClipboardEvent;
 class CursorShapeInfo;
 class PerformanceTracker;
 class FrameConsumer;
+class VideoRenderer;
 }  // namespace protocol
 
 class AudioPlayerAndroid;
 class ChromotingJniRuntime;
 class JniClient;
-class JniVideoRenderer;
 class DisplayHandler;
 class JniPairingSecretFetcher;
 
 // ChromotingJniInstance is scoped to the session.
 // This class is Created on the UI thread but thereafter it is used and
 // destroyed on the network thread. Except where indicated, all methods are
 // called on the network thread.
 class ChromotingJniInstance
   : public ClientUserInterface,
     public protocol::ClipboardStub {
  public:
   // Initiates a connection with the specified host. Call from the UI thread.
   // The instance does not take ownership of |jni_runtime|. To connect with an
   // unpaired host, pass in |pairing_id| and |pairing_secret| as empty strings.
   ChromotingJniInstance(ChromotingJniRuntime* jni_runtime,
                         base::WeakPtr<JniClient> jni_client,
                         base::WeakPtr<JniPairingSecretFetcher> secret_fetcher,
                         std::unique_ptr<protocol::CursorShapeStub> cursor_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);
 
@@ skipping 96 matching lines @@
   std::string host_jid_;
 
   protocol::ClientAuthenticationConfig client_auth_config_;
 
   std::string flags_;
 
   // This group of variables is to be used on the network thread.
   std::unique_ptr<ClientContext> client_context_;
   std::unique_ptr<protocol::PerformanceTracker> perf_tracker_;
   std::unique_ptr<protocol::CursorShapeStub> cursor_shape_stub_;
-  std::unique_ptr<JniVideoRenderer> video_renderer_;
+  std::unique_ptr<protocol::VideoRenderer> video_renderer_;
   std::unique_ptr<ChromotingClient> client_;
   XmppSignalStrategy::XmppServerConfig xmpp_config_;
   std::unique_ptr<XmppSignalStrategy> signaling_;  // Must outlive client_
   protocol::ThirdPartyTokenFetchedCallback third_party_token_fetched_callback_;
 
   std::unique_ptr<AudioPlayerAndroid> audio_player_;
 
   // Indicates whether to establish a new pairing with this host. This is
   // modified in ProvideSecret(), but thereafter to be used only from the
   // network thread. (This is safe because ProvideSecret() is invoked at most
@@ skipping 18 matching lines @@
   bool connected_ = false;
 
   base::WeakPtrFactory<ChromotingJniInstance> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingJniInstance);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_JNI_CHROMOTING_JNI_INSTANCE_H_