chrome/browser/media/webrtc/webrtc_disable_encryption_flag_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_disable_encryption_flag_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_browsertest_perf.cc ('k') | chrome/browser/media/webrtc/webrtc_event_log_handler.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 "base/macros.h"	6 #include "base/macros.h"

7 #include "build/build_config.h"	7 #include "build/build_config.h"

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

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

10 #include "chrome/common/channel_info.h"	10 #include "chrome/common/channel_info.h"

11 #include "components/version_info/version_info.h"	11 #include "components/version_info/version_info.h"

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

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

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

15	15

16 static const char kMainWebrtcTestHtmlPage[] =	16 static const char kMainWebrtcTestHtmlPage[] =

17 "/webrtc/webrtc_jsep01_test.html";	17 "/webrtc/webrtc_jsep01_test.html";

18	18

19 // This tests the --disable-webrtc-encryption command line flag. Disabling	19 // This tests the --disable-webrtc-encryption command line flag. Disabling

(...skipping 63 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
83	83

84 std::string expected_string = should_detect_encryption ?	84 std::string expected_string = should_detect_encryption ?

85 "crypto-seen" : "no-crypto-seen";	85 "crypto-seen" : "no-crypto-seen";

86	86

87 ASSERT_EQ(expected_string,	87 ASSERT_EQ(expected_string,

88 ExecuteJavascript("hasSeenCryptoInSdp()", left_tab));	88 ExecuteJavascript("hasSeenCryptoInSdp()", left_tab));

89	89

90 HangUp(left_tab);	90 HangUp(left_tab);

91 HangUp(right_tab);	91 HangUp(right_tab);

92 }	92 }

OLD	NEW