[Remoting Android] DisplayUpdaterFactory cleanups

remoting/client/jni/jni_display_handler.cc

Index: remoting/client/jni/jni_display_handler.cc
diff --git a/remoting/client/jni/jni_display_handler.cc b/remoting/client/jni/jni_display_handler.cc
index b699461e800a7585be9c90817bad05ebff8d9fe4..f7213858cddc4176f52cc88f0522cf23ae9aafff 100644
--- a/remoting/client/jni/jni_display_handler.cc
+++ b/remoting/client/jni/jni_display_handler.cc
@@ -12,7 +12,6 @@
 #include "jni/Display_jni.h"
 #include "remoting/client/jni/chromoting_jni_runtime.h"
 #include "remoting/client/jni/jni_client.h"
-#include "remoting/client/jni/jni_frame_consumer.h"
 #include "remoting/client/jni/jni_video_renderer.h"
 
 using base::android::JavaParamRef;
@@ -88,12 +87,13 @@ std::unique_ptr<protocol::CursorShapeStub>
 JniDisplayHandler::CreateCursorShapeStub() {
   return base::WrapUnique(
       new DisplayCursorShapeStub(weak_factory_.GetWeakPtr(),
-                                    runtime_->display_task_runner()));
+                                 runtime_->display_task_runner()));
 }
 
-std::unique_ptr<JniVideoRenderer> JniDisplayHandler::CreateVideoRenderer() {
+std::unique_ptr<protocol::VideoRenderer>
+JniDisplayHandler::CreateVideoRenderer() {
   return base::WrapUnique(
-      new JniFrameConsumer(runtime_, weak_factory_.GetWeakPtr()));
+      new JniVideoRenderer(runtime_, weak_factory_.GetWeakPtr()));

[Yuwei, 2016/06/30 07:51:02]

After separating initialization code from the ctor of SoftwareVideoRenderer,
looks like we don't even need to make JniFrameConsumer a video renderer, and
here we can simply return an uninitialized software renderer like

return base::WrapUnique(new SoftwareVideoRenderer(frame_consumer));

The slight problem is that it doesn't take ownership of the frame consumer and
JniDisplayHandler will need to delete the consumer on the network thread.

[Yuwei, 2016/06/30 19:13:54]

I will hold off this change to a future CL. Currently SoftwareVideoRenderer
takes in a raw pointer so it must not outlive the underlying frame consumer,
while the user of DisplayUpdaterFactory doesn't need to know anything about the
underlying frame consumer. Maybe later we can make SoftwareVideoRenderer take in
WeakPtr of frame consumer but that will involve lots of code changes of existing
frame consumers...

 }
 
 // static