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

Side by Side Diff: content/browser/media/webrtc_getusermedia_browsertest.cc

Issue 214823006: Move ContentBrowserTest class to content/public, since it's used by components_browsertests for bro… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: remove other files Created 6 years, 9 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 | Annotate | Revision Log
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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/debug/trace_event_impl.h" 6 #include "base/debug/trace_event_impl.h"
7 #include "base/json/json_reader.h" 7 #include "base/json/json_reader.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "base/test/trace_event_analyzer.h" 9 #include "base/test/trace_event_analyzer.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "content/browser/media/webrtc_internals.h" 11 #include "content/browser/media/webrtc_internals.h"
12 #include "content/browser/web_contents/web_contents_impl.h" 12 #include "content/browser/web_contents/web_contents_impl.h"
13 #include "content/public/common/content_switches.h" 13 #include "content/public/common/content_switches.h"
14 #include "content/public/test/browser_test_utils.h" 14 #include "content/public/test/browser_test_utils.h"
15 #include "content/public/test/content_browser_test_utils.h"
15 #include "content/public/test/test_utils.h" 16 #include "content/public/test/test_utils.h"
16 #include "content/shell/browser/shell.h" 17 #include "content/shell/browser/shell.h"
17 #include "content/test/content_browser_test_utils.h"
18 #include "content/test/webrtc_content_browsertest_base.h" 18 #include "content/test/webrtc_content_browsertest_base.h"
19 #include "net/test/embedded_test_server/embedded_test_server.h" 19 #include "net/test/embedded_test_server/embedded_test_server.h"
20 #include "testing/perf/perf_test.h" 20 #include "testing/perf/perf_test.h"
21 21
22 #if defined(OS_WIN) 22 #if defined(OS_WIN)
23 #include "base/win/windows_version.h" 23 #include "base/win/windows_version.h"
24 #endif 24 #endif
25 25
26 using trace_analyzer::TraceAnalyzer; 26 using trace_analyzer::TraceAnalyzer;
27 using trace_analyzer::Query; 27 using trace_analyzer::Query;
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 {640, 640, 480, 480, 30, 30}, 554 {640, 640, 480, 480, 30, 30},
555 {960, 960, 720, 720, 30, 30}, 555 {960, 960, 720, 720, 30, 30},
556 {1280, 1280, 720, 720, 30, 30}, 556 {1280, 1280, 720, 720, 30, 30},
557 {1920, 1920, 1080, 1080, 30, 30}}; 557 {1920, 1920, 1080, 1080, 30, 30}};
558 558
559 INSTANTIATE_TEST_CASE_P(UserMedia, 559 INSTANTIATE_TEST_CASE_P(UserMedia,
560 WebRtcConstraintsBrowserTest, 560 WebRtcConstraintsBrowserTest,
561 testing::ValuesIn(kAllUserMediaSizes)); 561 testing::ValuesIn(kAllUserMediaSizes));
562 562
563 } // namespace content 563 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/webrtc_browsertest.cc ('k') | content/browser/media/webrtc_internals_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698