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

content/browser/media/capture/desktop_capture_device_aura_unittest.cc

Index: content/browser/media/capture/desktop_capture_device_aura_unittest.cc
diff --git a/content/browser/media/capture/desktop_capture_device_aura_unittest.cc b/content/browser/media/capture/desktop_capture_device_aura_unittest.cc
index 054c933f4274808b138063e4b496bb2f666830c9..4c69a57c46dd3d20848614a19ce84eabfc8d86cc 100644
--- a/content/browser/media/capture/desktop_capture_device_aura_unittest.cc
+++ b/content/browser/media/capture/desktop_capture_device_aura_unittest.cc
@@ -51,28 +51,14 @@
                      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();
-  }
 };
 
 // Test harness that sets up a minimal environment with necessary stubs.