content/browser/media/webrtc/webrtc_getusermedia_browsertest.cc - Issue 2197143002: Revert of ImageCapture: content_browsertest WebRtcImageCaptureBrowserTest CreateAndGetCapabilities

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/webrtc/webrtc_getusermedia_browsertest.cc

Issue 2197143002: Revert of ImageCapture: content_browsertest WebRtcImageCaptureBrowserTest CreateAndGetCapabilities (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 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/webrtc/webrtc_datachannel_browsertest.cc ('k') | content/browser/media/webrtc/webrtc_image_capture_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/webrtc/webrtc_getusermedia_browsertest.cc

diff --git a/content/browser/media/webrtc/webrtc_getusermedia_browsertest.cc b/content/browser/media/webrtc/webrtc_getusermedia_browsertest.cc

index f5a0af83a7f27b36f80757ecef3f6b7def1fbde0..4e349a7c3855a76e74fb3967fe2ba9abcd023db3 100644

--- a/content/browser/media/webrtc/webrtc_getusermedia_browsertest.cc

+++ b/content/browser/media/webrtc/webrtc_getusermedia_browsertest.cc

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

#include "base/trace_event/trace_event_impl.h"

#include "base/values.h"

#include "build/build_config.h"

-#include "content/browser/media/webrtc/webrtc_content_browsertest_base.h"

#include "content/browser/media/webrtc/webrtc_internals.h"

#include "content/browser/web_contents/web_contents_impl.h"

#include "content/public/common/content_switches.h"

@@ -21,6 +20,7 @@

#include "content/public/test/content_browser_test_utils.h"

#include "content/public/test/test_utils.h"

#include "content/shell/browser/shell.h"

+#include "content/test/webrtc_content_browsertest_base.h"

#include "net/test/embedded_test_server/embedded_test_server.h"

#include "testing/perf/perf_test.h"