Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(713)

Side by Side Diff: content/browser/media/webrtc/webrtc_capture_from_element_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, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/strings/stringprintf.h" 6 #include "base/strings/stringprintf.h"
7 #include "content/browser/media/webrtc/webrtc_content_browsertest_base.h"
8 #include "content/public/common/content_switches.h" 7 #include "content/public/common/content_switches.h"
8 #include "content/test/webrtc_content_browsertest_base.h"
9 #include "media/base/test_data_util.h" 9 #include "media/base/test_data_util.h"
10 10
11 namespace { 11 namespace {
12 12
13 static const char kCanvasTestHtmlPage[] = "/media/canvas_capture_color.html"; 13 static const char kCanvasTestHtmlPage[] = "/media/canvas_capture_color.html";
14 14
15 static const char kVideoAudioHtmlFile[] = 15 static const char kVideoAudioHtmlFile[] =
16 "/media/video_audio_element_capture_test.html"; 16 "/media/video_audio_element_capture_test.html";
17 17
18 static struct FileAndTypeParameters { 18 static struct FileAndTypeParameters {
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 GetParam().has_video, 68 GetParam().has_video,
69 GetParam().has_audio, 69 GetParam().has_audio,
70 GetParam().use_audio_tag), 70 GetParam().use_audio_tag),
71 kVideoAudioHtmlFile); 71 kVideoAudioHtmlFile);
72 } 72 }
73 73
74 INSTANTIATE_TEST_CASE_P(, 74 INSTANTIATE_TEST_CASE_P(,
75 WebRtcCaptureFromElementBrowserTest, 75 WebRtcCaptureFromElementBrowserTest,
76 testing::ValuesIn(kFileAndTypeParameters)); 76 testing::ValuesIn(kFileAndTypeParameters));
77 } // namespace content 77 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698