Converted VideoFrameCapturer callbacks into a VideoFrameCapturer::Delegate interface.

remoting/host/video_scheduler_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "remoting/host/video_scheduler.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/run_loop.h"
 #include "remoting/base/capture_data.h"
@@ skipping 16 matching lines @@
 using ::testing::InSequence;
 using ::testing::InvokeWithoutArgs;
 using ::testing::Return;
 using ::testing::ReturnRef;
 using ::testing::SaveArg;
 
 namespace remoting {
 
 namespace {
 
-ACTION_P2(RunCallback, region, data) {
-  SkRegion& dirty_region = data->mutable_dirty_region();
-  dirty_region.op(region, SkRegion::kUnion_Op);
-  arg0.Run(data);
-}
-
 ACTION(FinishEncode) {
   scoped_ptr<VideoPacket> packet(new VideoPacket());
   packet->set_flags(VideoPacket::LAST_PACKET | VideoPacket::LAST_PARTITION);
   arg2.Run(packet.Pass());
 }
 
 ACTION(FinishSend) {
   arg1.Run();
 }
 
@@ skipping 40 matching lines @@
     scheduler_ = new VideoScheduler(
         message_loop_.message_loop_proxy(),
         message_loop_.message_loop_proxy(),
         message_loop_.message_loop_proxy(),
         &capturer_,
         scoped_ptr<VideoEncoder>(encoder_),
         &client_stub_,
         &video_stub_);
   }
 
+  void GenerateOnCaptureCompleted();
+
  protected:
   MessageLoop message_loop_;
   scoped_refptr<VideoScheduler> scheduler_;
 
   MockClientStub client_stub_;
   MockVideoStub video_stub_;
   MockVideoFrameCapturer capturer_;
 
   // The following mock objects are owned by VideoScheduler.
   MockVideoEncoder* encoder_;
 
+  SkISize size_;

[simonmorris, 2012/11/07 20:35:21]

I think SkISize's default constructor doesn't initialize it: if so, initialize
size_ in the VideoSchedulerTest constructor.

[alexeypa (please no reviews), 2012/11/07 20:54:41]

Done.

+  scoped_refptr<CaptureData> data_;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(VideoSchedulerTest);
 };
 
+void VideoSchedulerTest::GenerateOnCaptureCompleted() {
+  SkRegion update_region(SkIRect::MakeXYWH(0, 0, 10, 10));
+  data_->mutable_dirty_region().op(update_region, SkRegion::kUnion_Op);
+
+  scheduler_->OnCaptureCompleted(data_);
+}
+
 // This test mocks capturer, encoder and network layer to simulate one capture
 // cycle. When the first encoded packet is submitted to the network
 // VideoScheduler is instructed to come to a complete stop. We expect the stop
 // sequence to be executed successfully.
 TEST_F(VideoSchedulerTest, StartAndStop) {
-  SkRegion update_region(SkIRect::MakeXYWH(0, 0, 10, 10));
   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(_));
 
-  SkISize size(SkISize::Make(kWidth, kHeight));
-  scoped_refptr<CaptureData> data(new CaptureData(planes, size, kFormat));
+  size_.set(kWidth, kHeight);
+  data_ = new CaptureData(planes, size_, kFormat);
 
   // Create a RunLoop through which to drive |message_loop_|.
   base::RunLoop run_loop;
 
   EXPECT_CALL(capturer_, size_most_recent())
-      .WillRepeatedly(ReturnRef(size));
+      .WillRepeatedly(ReturnRef(size_));
 
   // First the capturer is called.
-  Expectation capturer_capture = EXPECT_CALL(capturer_, CaptureInvalidRegion(_))
+  Expectation capturer_capture = EXPECT_CALL(capturer_, CaptureInvalidRegion())
       .After(capturer_start)
-      .WillRepeatedly(RunCallback(update_region, data));
+      .WillRepeatedly(InvokeWithoutArgs(
+          this, &VideoSchedulerTest::GenerateOnCaptureCompleted));
 
   // Expect the encoder be called.
-  EXPECT_CALL(*encoder_, Encode(data, false, _))
+  EXPECT_CALL(*encoder_, Encode(data_, false, _))
       .WillRepeatedly(FinishEncode());
 
   // By default delete the arguments when ProcessVideoPacket is received.
   EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
       .WillRepeatedly(FinishSend());
 
   // For the first time when ProcessVideoPacket is received we stop the
   // VideoScheduler.
   EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
       .WillOnce(DoAll(
           FinishSend(),
           StopVideoScheduler(&scheduler_, run_loop.QuitClosure())))
       .RetiresOnSaturation();
 
   EXPECT_CALL(capturer_, Stop())
       .After(capturer_capture);
 
   // Start video frame capture.
   StartVideoScheduler();
   run_loop.Run();
 }
 
 }  // namespace remoting