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

Side by Side Diff: chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc

Issue 265263004: Mac Video Capture Device: split VCD into VCD and Factory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reconnected VCDFMac::Create() check for device name; VCDTest::OpenInvalidDevice needs Mac API Type. Created 6 years, 7 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/win/windows_version.h" 6 #include "base/win/windows_version.h"
7 #include "chrome/browser/media/webrtc_browsertest_base.h" 7 #include "chrome/browser/media/webrtc_browsertest_base.h"
8 #include "chrome/browser/media/webrtc_browsertest_common.h" 8 #include "chrome/browser/media/webrtc_browsertest_common.h"
9 #include "chrome/common/chrome_version_info.h" 9 #include "chrome/common/chrome_version_info.h"
10 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
11 #include "media/base/media_switches.h"
11 #include "net/test/embedded_test_server/embedded_test_server.h" 12 #include "net/test/embedded_test_server/embedded_test_server.h"
12 13
13 static const char kMainWebrtcTestHtmlPage[] = 14 static const char kMainWebrtcTestHtmlPage[] =
14 "/webrtc/webrtc_jsep01_test.html"; 15 "/webrtc/webrtc_jsep01_test.html";
15 16
16 using chrome::VersionInfo; 17 using chrome::VersionInfo;
17 18
18 // This tests the --disable-webrtc-encryption command line flag. Disabling 19 // This tests the --disable-webrtc-encryption command line flag. Disabling
19 // encryption should only be possible on certain channels. 20 // encryption should only be possible on certain channels.
20 21
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 97
97 ASSERT_EQ(expected_string, 98 ASSERT_EQ(expected_string,
98 ExecuteJavascript("hasSeenCryptoInSdp()", left_tab)); 99 ExecuteJavascript("hasSeenCryptoInSdp()", left_tab));
99 100
100 HangUp(left_tab); 101 HangUp(left_tab);
101 WaitUntilHangupVerified(left_tab); 102 WaitUntilHangupVerified(left_tab);
102 WaitUntilHangupVerified(right_tab); 103 WaitUntilHangupVerified(right_tab);
103 104
104 ASSERT_TRUE(peerconnection_server_.Stop()); 105 ASSERT_TRUE(peerconnection_server_.Stop());
105 } 106 }
OLDNEW
« no previous file with comments | « chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc ('k') | chrome/test/ppapi/ppapi_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698