Connect to DesktopEnvironment's stubs only when audio/video schedulers are about to be created.

remoting/host/mouse_clamping_filter.h

Index: remoting/host/mouse_clamping_filter.h
diff --git a/remoting/host/mouse_clamping_filter.h b/remoting/host/mouse_clamping_filter.h
index 02ff17a214cb80255670012c92bd773fd2fe3581..0806f6fe2528e3b1702450a5c7b61666c5ee7ffb 100644
--- a/remoting/host/mouse_clamping_filter.h
+++ b/remoting/host/mouse_clamping_filter.h
@@ -7,25 +7,27 @@
 
 #include "base/compiler_specific.h"
 #include "remoting/protocol/mouse_input_filter.h"
+#include "remoting/protocol/video_stub.h"
 
 namespace remoting {
 
-class VideoFrameCapturer;
-
 // Filtering InputStub implementation which clamps mouse each mouse event to
 // the current dimensions of a VideoFrameCapturer instance before passing

[Wez, 2013/01/08 18:34:00]

nit: (Assuming the composition change suggested below) "Filtering VideoStub
implementation which configures a MouseInputFilter to clamp mouse events to fall
within the dimensions of the most-recently received video frame."

[alexeypa (please no reviews), 2013/01/08 20:00:14]

Done.

 // them on to the target |input_stub|.
-class MouseClampingFilter : public protocol::MouseInputFilter {
+class MouseClampingFilter
+    : public protocol::MouseInputFilter,

[Wez, 2013/01/08 18:34:00]

It would be cleaner to compose with MouseInputFilter than derived from it,
either by having this class contain & expose it, or having the caller pass one
in instead of |input_stub|.

[alexeypa (please no reviews), 2013/01/08 20:00:14]

Done.

[Wez, 2013/01/08 21:02:42]

I'd actually thought that the composed implementation would not derived from
InputStub at all, it would either be passed the MouseInputFilter to configure,
or it'd have an input_stub() getter to get at the InputStub interface of the
MouseInputFilter member.

[alexeypa (please no reviews), 2013/01/08 21:30:24]

Done.

+      public protocol::VideoStub {
  public:
-  MouseClampingFilter(VideoFrameCapturer* capturer,
-                      protocol::InputStub* input_stub);
+  MouseClampingFilter(protocol::InputStub* input_stub,
+                      protocol::VideoStub* video_stub);
   virtual ~MouseClampingFilter();
 
-  // InputStub overrides.
-  virtual void InjectMouseEvent(const protocol::MouseEvent& event) OVERRIDE;
+  // protocol::VideoStub implementation.
+  virtual void ProcessVideoPacket(scoped_ptr<VideoPacket> video_packet,
+                                  const base::Closure& done) OVERRIDE;
 
  private:
-  VideoFrameCapturer* capturer_;
+  protocol::VideoStub* video_stub_;
 
   DISALLOW_COPY_AND_ASSIGN(MouseClampingFilter);
 };