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

Side by Side 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, 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/json/json_reader.h" 8 #include "base/json/json_reader.h"
9 #include "base/memory/ref_counted_memory.h" 9 #include "base/memory/ref_counted_memory.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
11 #include "base/test/trace_event_analyzer.h" 11 #include "base/test/trace_event_analyzer.h"
12 #include "base/threading/thread_restrictions.h" 12 #include "base/threading/thread_restrictions.h"
13 #include "base/trace_event/trace_event_impl.h" 13 #include "base/trace_event/trace_event_impl.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "build/build_config.h" 15 #include "build/build_config.h"
16 #include "content/browser/media/webrtc/webrtc_content_browsertest_base.h"
17 #include "content/browser/media/webrtc/webrtc_internals.h" 16 #include "content/browser/media/webrtc/webrtc_internals.h"
18 #include "content/browser/web_contents/web_contents_impl.h" 17 #include "content/browser/web_contents/web_contents_impl.h"
19 #include "content/public/common/content_switches.h" 18 #include "content/public/common/content_switches.h"
20 #include "content/public/test/browser_test_utils.h" 19 #include "content/public/test/browser_test_utils.h"
21 #include "content/public/test/content_browser_test_utils.h" 20 #include "content/public/test/content_browser_test_utils.h"
22 #include "content/public/test/test_utils.h" 21 #include "content/public/test/test_utils.h"
23 #include "content/shell/browser/shell.h" 22 #include "content/shell/browser/shell.h"
23 #include "content/test/webrtc_content_browsertest_base.h"
24 #include "net/test/embedded_test_server/embedded_test_server.h" 24 #include "net/test/embedded_test_server/embedded_test_server.h"
25 #include "testing/perf/perf_test.h" 25 #include "testing/perf/perf_test.h"
26 26
27 #if defined(OS_WIN) 27 #if defined(OS_WIN)
28 #include "base/win/windows_version.h" 28 #include "base/win/windows_version.h"
29 #endif 29 #endif
30 30
31 using trace_analyzer::TraceAnalyzer; 31 using trace_analyzer::TraceAnalyzer;
32 using trace_analyzer::Query; 32 using trace_analyzer::Query;
33 using trace_analyzer::TraceEventVector; 33 using trace_analyzer::TraceEventVector;
(...skipping 742 matching lines...) Expand 10 before | Expand all | Expand 10 after
776 {640, 640, 360, 360, 10, 30}, 776 {640, 640, 360, 360, 10, 30},
777 {640, 640, 480, 480, 10, 30}, 777 {640, 640, 480, 480, 10, 30},
778 {960, 960, 720, 720, 10, 30}, 778 {960, 960, 720, 720, 10, 30},
779 {1280, 1280, 720, 720, 10, 30}}; 779 {1280, 1280, 720, 720, 10, 30}};
780 780
781 INSTANTIATE_TEST_CASE_P(UserMedia, 781 INSTANTIATE_TEST_CASE_P(UserMedia,
782 WebRtcConstraintsBrowserTest, 782 WebRtcConstraintsBrowserTest,
783 testing::ValuesIn(kAllUserMediaSizes)); 783 testing::ValuesIn(kAllUserMediaSizes));
784 784
785 } // namespace content 785 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698