content/browser/media/capture/desktop_capture_device_aura_unittest.cc - Issue 1204843004: Revert of Video Capture: extract storage info from pixel format in VideoCaptureFormat.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/media/capture/desktop_capture_device_aura_unittest.cc

Issue 1204843004: Revert of Video Capture: extract storage info from pixel format in VideoCaptureFormat. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/media/capture/aura_window_capture_machine.cc ('k') | content/browser/media/capture/desktop_capture_device_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 2ec6d4aa57f3f2ec1bec49095a772e3efc942844..88c75a603cc91f2dff995299d159155fc21591fc 100644

--- a/content/browser/media/capture/desktop_capture_device_aura_unittest.cc

+++ b/content/browser/media/capture/desktop_capture_device_aura_unittest.cc

@@ -57,14 +57,8 @@

MOCK_METHOD1(OnError, void(const std::string& reason));

// Trampoline methods to workaround GMOCK problems with scoped_ptr<>.

- scoped_ptr<Buffer> ReserveOutputBuffer(

- const gfx::Size& dimensions,

- media::VideoPixelFormat format,

- media::VideoPixelStorage storage) override {

- EXPECT_TRUE((format == media::PIXEL_FORMAT_I420 &&

- storage == media::PIXEL_STORAGE_CPU) ||

- (format == media::PIXEL_FORMAT_ARGB &&

- storage == media::PIXEL_STORAGE_TEXTURE));

+ scoped_ptr<Buffer> ReserveOutputBuffer(media::VideoPixelFormat format,

+ const gfx::Size& dimensions) override {

DoReserveOutputBuffer();

return scoped_ptr<Buffer>();

}