content/browser/media/capture/desktop_capture_device_aura_unittest.cc - Issue 2415703002: Move files video_capture*.* from media/base to media/capture

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 2415703002: Move files video_capture*.* from media/base to media/capture (Closed)

Patch Set: rebase Created 4 years, 2 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/web_contents_video_capture_device.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 06265ab0024e6c1550d272bd5de93a7d20a9c00d..68bc898b42666b026b1f686e192ac4c4841ace53 100644

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

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

@@ -13,7 +13,7 @@

#include "base/synchronization/waitable_event.h"

#include "content/browser/browser_thread_impl.h"

#include "content/public/browser/desktop_media_id.h"

-#include "media/base/video_capture_types.h"

+#include "media/capture/video_capture_types.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

#include "ui/aura/client/window_parenting_client.h"