Revert of VideoCapture: add support for GpuMemoryBuffer allocation and lifetime mgmt in VideoCaptureBufferPool

content/browser/media/capture/desktop_capture_device_unittest.cc

 // Copyright (c) 2013 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 "content/browser/media/capture/desktop_capture_device.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 51 matching lines @@
   MOCK_METHOD9(OnIncomingCapturedYuvData,
                void (const uint8* y_data,
                      const uint8* u_data,
                      const uint8* v_data,
                      size_t y_stride,
                      size_t u_stride,
                      size_t v_stride,
                      const media::VideoCaptureFormat& frame_format,
                      int clockwise_rotation,
                      const base::TimeTicks& timestamp));
-  MOCK_METHOD0(DoReserveOutputBuffer, void(void));
-  MOCK_METHOD0(DoOnIncomingCapturedBuffer, void(void));
-  MOCK_METHOD0(DoOnIncomingCapturedVideoFrame, void(void));
+  MOCK_METHOD2(ReserveOutputBuffer,
+               scoped_refptr<Buffer>(media::VideoPixelFormat format,
+                                     const gfx::Size& dimensions));
+  MOCK_METHOD3(OnIncomingCapturedVideoFrame,
+               void(const scoped_refptr<Buffer>& buffer,
+                    const scoped_refptr<media::VideoFrame>& frame,
+                    const base::TimeTicks& timestamp));
   MOCK_METHOD1(OnError, void(const std::string& reason));
-
-  // Trampoline methods to workaround GMOCK problems with scoped_ptr<>.
-  scoped_ptr<Buffer> ReserveOutputBuffer(media::VideoPixelFormat format,
-                                         const gfx::Size& dimensions) override {
-    DoReserveOutputBuffer();
-    return scoped_ptr<Buffer>();
-  }
-  void OnIncomingCapturedBuffer(scoped_ptr<Buffer> buffer,
-                                const media::VideoCaptureFormat& frame_format,
-                                const base::TimeTicks& timestamp) override {
-    DoOnIncomingCapturedBuffer();
-  }
-  void OnIncomingCapturedVideoFrame(
-      scoped_ptr<Buffer> buffer,
-      const scoped_refptr<media::VideoFrame>& frame,
-      const base::TimeTicks& timestamp) override {
-    DoOnIncomingCapturedVideoFrame();
-  }
 };
 
 // Creates a DesktopFrame that has the first pixel bytes set to
 // kFakePixelValueFirst, and the rest of the bytes set to kFakePixelValue, for
 // UnpackedFrame and InvertedFrame verification.
 webrtc::BasicDesktopFrame* CreateBasicFrame(const webrtc::DesktopSize& size) {
   webrtc::BasicDesktopFrame* frame = new webrtc::BasicDesktopFrame(size);;
   DCHECK_EQ(frame->size().width() * webrtc::DesktopFrame::kBytesPerPixel,
             frame->stride());
   memset(frame->data(),
@@ skipping 332 matching lines @@
             frame_size);
   for (int i = 0; i < output_frame_->size().height(); ++i) {
     EXPECT_EQ(0,
         memcmp(inverted_frame->data() + i * inverted_frame->stride(),
                output_frame_->data() + i * output_frame_->stride(),
                output_frame_->stride()));
   }
 }
 
 }  // namespace content