chrome/browser/media/webrtc/webrtc_webcam_browsertest.cc - Issue 2307083002: Cleanup: move WebRTC related files from chrome/browser/media to chrome/browser/media/webrtc/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/media/webrtc/webrtc_webcam_browsertest.cc

Issue 2307083002: Cleanup: move WebRTC related files from chrome/browser/media to chrome/browser/media/webrtc/ (Closed)

Patch Set: Removed file wrongly resuscitated during rebase Created 4 years, 3 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

« no previous file with comments | « chrome/browser/media/webrtc/webrtc_video_quality_browsertest.cc ('k') | chrome/browser/media/webrtc/window_icon_util.h » ('j') | no next file with comments »

OLD	NEW
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 "build/build_config.h"	6 #include "build/build_config.h"

7 #include "chrome/browser/media/webrtc_browsertest_base.h"	7 #include "chrome/browser/media/webrtc/webrtc_browsertest_base.h"

8 #include "chrome/browser/media/webrtc_browsertest_common.h"	8 #include "chrome/browser/media/webrtc/webrtc_browsertest_common.h"

9 #include "chrome/browser/ui/browser.h"	9 #include "chrome/browser/ui/browser.h"

10 #include "chrome/browser/ui/browser_tabstrip.h"	10 #include "chrome/browser/ui/browser_tabstrip.h"

11 #include "chrome/browser/ui/tabs/tab_strip_model.h"	11 #include "chrome/browser/ui/tabs/tab_strip_model.h"

12 #include "chrome/common/chrome_switches.h"	12 #include "chrome/common/chrome_switches.h"

13 #include "chrome/test/base/in_process_browser_test.h"	13 #include "chrome/test/base/in_process_browser_test.h"

14 #include "chrome/test/base/ui_test_utils.h"	14 #include "chrome/test/base/ui_test_utils.h"

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

16 #include "content/public/test/browser_test_utils.h"	16 #include "content/public/test/browser_test_utils.h"

17 #include "media/base/media_switches.h"	17 #include "media/base/media_switches.h"

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

(...skipping 72 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
91 GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints360p));	91 GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints360p));

92 EXPECT_EQ("1280x720",	92 EXPECT_EQ("1280x720",

93 GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints720p));	93 GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints720p));

94 EXPECT_EQ("1920x1080",	94 EXPECT_EQ("1920x1080",

95 GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints1080p));	95 GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints1080p));

96 }	96 }

97	97

98 INSTANTIATE_TEST_CASE_P(WebRtcWebcamBrowserTests,	98 INSTANTIATE_TEST_CASE_P(WebRtcWebcamBrowserTests,

99 WebRtcWebcamBrowserTest,	99 WebRtcWebcamBrowserTest,

100 testing::ValuesIn(kTestConfigFlags));	100 testing::ValuesIn(kTestConfigFlags));

OLD	NEW