[Remoting Android] DisplayUpdaterFactory cleanups

remoting/client/plugin/pepper_video_renderer_3d.h

 // Copyright 2014 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_PLUGIN_PEPPER_VIDEO_RENDERER_3D_H_
 #define REMOTING_CLIENT_PLUGIN_PEPPER_VIDEO_RENDERER_3D_H_
 
 #include <stdint.h>
 
 #include <list>
@@ skipping 16 matching lines @@
 
 // PepperVideoRenderer that uses the PPB_VideoDecoder interface for video
 // decoding and Graphics3D for rendering.
 class PepperVideoRenderer3D : public PepperVideoRenderer,
                               public protocol::VideoStub {
  public:
   PepperVideoRenderer3D();
   ~PepperVideoRenderer3D() override;
 
   // PepperVideoRenderer interface.
-  bool Initialize(pp::Instance* instance,
-                  const ClientContext& context,
-                  EventHandler* event_handler,
-                  protocol::PerformanceTracker* perf_tracker) override;
+  void SetPepperContext(pp::Instance* instance,
+                        EventHandler* event_handler) override;
   void OnViewChanged(const pp::View& view) override;
   void EnableDebugDirtyRegion(bool enable) override;
 
   // VideoRenderer interface.
+  bool Initialize(const ClientContext& client_context,
+                  protocol::PerformanceTracker* perf_tracker) override;
   void OnSessionConfig(const protocol::SessionConfig& config) override;
   protocol::VideoStub* GetVideoStub() override;
   protocol::FrameConsumer* GetFrameConsumer() override;
 
   // protocol::VideoStub interface.
   void ProcessVideoPacket(std::unique_ptr<VideoPacket> packet,
                           const base::Closure& done) override;
 
  private:
   // Class responsible for tracking state of a frame until it's rendered.
@@ skipping 29 matching lines @@
 
   // Initializes |shader_program_| with the given shaders.
   void CreateProgram(const char* vertex_shader, const char* fragment_shader);
 
   // Creates a new shader and compiles |source| for it.
   void CreateShaderProgram(int type, const char* source);
 
   // CHECKs that the last OpenGL call has completed successfully.
   void CheckGLError();
 
+  pp::Instance* pp_instance_ = nullptr;
   EventHandler* event_handler_ = nullptr;
   protocol::PerformanceTracker* perf_tracker_ = nullptr;
 
   pp::Graphics3D graphics_;
   const PPB_OpenGLES2* gles2_if_;
   pp::VideoDecoder video_decoder_;
 
   webrtc::DesktopSize frame_size_;
 
   webrtc::DesktopSize view_size_;
@@ skipping 47 matching lines @@
   bool debug_dirty_region_ = false;
 
   pp::CompletionCallbackFactory<PepperVideoRenderer3D> callback_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperVideoRenderer3D);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_PLUGIN_PEPPER_VIDEO_RENDERER_3D_H_