Simplify remoting::CaptureData

1. Previously CaptureData had pixel_format() field but we only use that 
   class for RGB. Removed that field.
2. Removed DataPlanes because it's doesn't make sense for RGB32. Instead
   CaptureData class now stored data pointer and stride values.

TBR=tsepez@chromium.org

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

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

1 files changed, 1 insertions, 10 deletions

diff --git a/remoting/host/video_scheduler_unittest.cc b/remoting/host/video_scheduler_unittest.cc
index 7ef6439..8335c5c 100644
--- a/remoting/host/video_scheduler_unittest.cc
+++ b/remoting/host/video_scheduler_unittest.cc
@@ -52,9 +52,6 @@ ACTION_P2(StopVideoScheduler, scheduler, task) {
 
 static const int kWidth = 640;
 static const int kHeight = 480;
-static const media::VideoFrame::Format kFormat = media::VideoFrame::RGB32;
-static const VideoPacketFormat::Encoding kEncoding =
-    VideoPacketFormat::ENCODING_VERBATIM;
 
 class MockVideoEncoder : public VideoEncoder {
  public:
@@ -126,16 +123,10 @@ void VideoSchedulerTest::GenerateOnCaptureCompleted() {
 // VideoScheduler is instructed to come to a complete stop. We expect the stop
 // sequence to be executed successfully.
 TEST_F(VideoSchedulerTest, StartAndStop) {
-  DataPlanes planes;
-  for (int i = 0; i < DataPlanes::kPlaneCount; ++i) {
-    planes.data[i] = reinterpret_cast<uint8*>(i);
-    planes.strides[i] = kWidth * 4;
-  }
-
   Expectation capturer_start = EXPECT_CALL(capturer_, Start(_));
 
   size_.set(kWidth, kHeight);
-  data_ = new CaptureData(planes, size_, kFormat);
+  data_ = new CaptureData(NULL, kWidth * CaptureData::kBytesPerPixel, size_);
 
   // Create a RunLoop through which to drive |message_loop_|.
   base::RunLoop run_loop;