Use more specific protocol::CursorShapeStub instead of protocol::ClientStub in VideoScheduler.

Review URL: https://chromiumcodereview.appspot.com/11646010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174745 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 10 deletions

diff --git a/remoting/host/video_scheduler.cc b/remoting/host/video_scheduler.cc
index f421df7..75c7c12 100644
--- a/remoting/host/video_scheduler.cc
+++ b/remoting/host/video_scheduler.cc
@@ -20,7 +20,7 @@
 #include "remoting/proto/control.pb.h"
 #include "remoting/proto/internal.pb.h"
 #include "remoting/proto/video.pb.h"
-#include "remoting/protocol/client_stub.h"
+#include "remoting/protocol/cursor_shape_stub.h"
 #include "remoting/protocol/message_decoder.h"
 #include "remoting/protocol/video_stub.h"
 #include "remoting/protocol/util.h"
@@ -38,17 +38,17 @@ scoped_refptr<VideoScheduler> VideoScheduler::Create(
     scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
     VideoFrameCapturer* capturer,
     scoped_ptr<VideoEncoder> encoder,
-    protocol::ClientStub* client_stub,
+    protocol::CursorShapeStub* cursor_stub,
     protocol::VideoStub* video_stub) {
   DCHECK(network_task_runner->BelongsToCurrentThread());
   DCHECK(capturer);
   DCHECK(encoder);
-  DCHECK(client_stub);
+  DCHECK(cursor_stub);
   DCHECK(video_stub);
 
   scoped_refptr<VideoScheduler> scheduler = new VideoScheduler(
       capture_task_runner, encode_task_runner, network_task_runner,
-      capturer, encoder.Pass(), client_stub, video_stub);
+      capturer, encoder.Pass(), cursor_stub, video_stub);
   capture_task_runner->PostTask(
       FROM_HERE, base::Bind(&VideoScheduler::StartOnCaptureThread, scheduler));
 
@@ -143,14 +143,14 @@ VideoScheduler::VideoScheduler(
     scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
     VideoFrameCapturer* capturer,
     scoped_ptr<VideoEncoder> encoder,
-    protocol::ClientStub* client_stub,
+    protocol::CursorShapeStub* cursor_stub,
     protocol::VideoStub* video_stub)
     : capture_task_runner_(capture_task_runner),
       encode_task_runner_(encode_task_runner),
       network_task_runner_(network_task_runner),
       capturer_(capturer),
       encoder_(encoder.Pass()),
-      cursor_stub_(client_stub),
+      cursor_stub_(cursor_stub),
       video_stub_(video_stub),
       pending_captures_(0),
       did_skip_frame_(false),
diff --git a/remoting/host/video_scheduler.h b/remoting/host/video_scheduler.h
index 92b72f6..61b9009 100644
--- a/remoting/host/video_scheduler.h
+++ b/remoting/host/video_scheduler.h
@@ -29,8 +29,8 @@ class CursorShapeInfo;
 class VideoFrameCapturer;
 
 namespace protocol {
-class ClientStub;
 class CursorShapeInfo;
+class CursorShapeStub;
 class VideoStub;
 }  // namespace protocol
 
@@ -84,7 +84,7 @@ class VideoScheduler : public base::RefCountedThreadSafe<VideoScheduler>,
       scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
       VideoFrameCapturer* capturer,
       scoped_ptr<VideoEncoder> encoder,
-      protocol::ClientStub* client_stub,
+      protocol::CursorShapeStub* cursor_stub,
       protocol::VideoStub* video_stub);
 
   // VideoFrameCapturer::Delegate implementation.
@@ -115,7 +115,7 @@ class VideoScheduler : public base::RefCountedThreadSafe<VideoScheduler>,
       scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
       VideoFrameCapturer* capturer,
       scoped_ptr<VideoEncoder> encoder,
-      protocol::ClientStub* client_stub,
+      protocol::CursorShapeStub* cursor_stub,
       protocol::VideoStub* video_stub);
   virtual ~VideoScheduler();
 
@@ -173,7 +173,7 @@ class VideoScheduler : public base::RefCountedThreadSafe<VideoScheduler>,
 
   // Interfaces through which video frames and cursor shapes are passed to the
   // client. These members are always accessed on the network thread.
-  protocol::ClientStub* cursor_stub_;
+  protocol::CursorShapeStub* cursor_stub_;
   protocol::VideoStub* video_stub_;
 
   // Timer used to schedule CaptureNextFrame().