Converted VideoFrameCapturer callbacks into a VideoFrameCapturer::Delegate interface.

remoting/host/video_frame_capturer_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_frame_capturer.h"
 
 #include "base/bind.h"
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #endif  // defined(OS_MACOSX)
 #include "remoting/base/capture_data.h"
 #include "remoting/host/host_mock_objects.h"
 #include "remoting/protocol/protocol_mock_objects.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using ::testing::_;
+
 namespace remoting {
 
 namespace {
 
-void IgnoreCursorShapeChanged(scoped_ptr<protocol::CursorShapeInfo> info) {
+class MockCapturerDelegate : public VideoFrameCapturer::Delegate {
+ public:
+  MockCapturerDelegate();
+  virtual ~MockCapturerDelegate();
+
+  virtual void OnCursorShapeChanged(
+      scoped_ptr<protocol::CursorShapeInfo> cursor_shape) OVERRIDE;
+
+  MOCK_METHOD1(OnCaptureCompleted, void(scoped_refptr<CaptureData>));
+  MOCK_METHOD1(OnCursorShapeChangedPtr, void(protocol::CursorShapeInfo*));
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MockCapturerDelegate);
+};
+
+MockCapturerDelegate::MockCapturerDelegate() {
+}
+
+MockCapturerDelegate::~MockCapturerDelegate() {
+}
+
+void MockCapturerDelegate::OnCursorShapeChanged(
+    scoped_ptr<protocol::CursorShapeInfo> cursor_shape) {
+  // Notify the mock method.
+  OnCursorShapeChangedPtr(cursor_shape.get());
 }
 
 }  // namespace
 
 MATCHER(DirtyRegionIsNonEmptyRect, "") {
   const SkRegion& dirty_region = arg->dirty_region();
   const SkIRect& dirty_region_bounds = dirty_region.getBounds();
   if (dirty_region_bounds.isEmpty()) {
     return false;
   }
   return dirty_region == SkRegion(dirty_region_bounds);
 }
 
 class VideoFrameCapturerTest : public testing::Test {
  protected:
   virtual void SetUp() OVERRIDE {
     capturer_.reset(VideoFrameCapturer::Create());
   }
 
   scoped_ptr<VideoFrameCapturer> capturer_;
-  MockCaptureCompletedCallback capture_completed_callback_;
+  MockCapturerDelegate delegate_;
 };
 
 TEST_F(VideoFrameCapturerTest, StartCapturer) {
-  capturer_->Start(base::Bind(&IgnoreCursorShapeChanged));
+  capturer_->Start(&delegate_);
   capturer_->Stop();
 }
 
 TEST_F(VideoFrameCapturerTest, Capture) {
   // Assume that Start() treats the screen as invalid initially.
-  EXPECT_CALL(capture_completed_callback_,
-              CaptureCompletedPtr(DirtyRegionIsNonEmptyRect()));
+  EXPECT_CALL(delegate_,
+              OnCaptureCompleted(DirtyRegionIsNonEmptyRect()));
+  EXPECT_CALL(delegate_, OnCursorShapeChangedPtr(_));
 
-  capturer_->Start(base::Bind(&IgnoreCursorShapeChanged));
-  capturer_->CaptureInvalidRegion(base::Bind(
-      &MockCaptureCompletedCallback::CaptureCompleted,
-      base::Unretained(&capture_completed_callback_)));
+  capturer_->Start(&delegate_);
+  capturer_->CaptureInvalidRegion();
   capturer_->Stop();
 }
 
 }  // namespace remoting