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

Unified Diff: chrome/browser/media/webrtc_browsertest_base.cc

Issue 1917133002: WebRtcBrowserTest tests with RSA and ECDSA certificates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media/webrtc_browsertest_base.cc
diff --git a/chrome/browser/media/webrtc_browsertest_base.cc b/chrome/browser/media/webrtc_browsertest_base.cc
index 378c80d7887f9c605407c735b806e98d967f660e..7a5a7b5e39cb9a8f8ede8f09e4080f5f018fb91f 100644
--- a/chrome/browser/media/webrtc_browsertest_base.cc
+++ b/chrome/browser/media/webrtc_browsertest_base.cc
@@ -55,6 +55,8 @@ const char WebRtcTestBase::kAudioVideoCallConstraints360p[] =
const char WebRtcTestBase::kAudioVideoCallConstraints720p[] =
"{audio: true, video: {mandatory: {minWidth: 1280, maxWidth: 1280, "
" minHeight: 720, maxHeight: 720}}}";
+const char WebRtcTestBase::kUseDefaultCertKeygen[] = "null";
+const char WebRtcTestBase::kUseDefaultVideoCodec[] = "";
hbos_chromium 2016/04/27 11:19:03 I could default this to "null" too if you want bef
phoglund_chromium 2016/04/27 13:23:12 Hm, I think the video codec is used to construct p
namespace {
@@ -303,15 +305,21 @@ std::string WebRtcTestBase::ExecuteJavascript(
}
void WebRtcTestBase::SetupPeerconnectionWithLocalStream(
- content::WebContents* tab) const {
- SetupPeerconnectionWithoutLocalStream(tab);
+ content::WebContents* tab,
+ std::string certificate_keygen_algorithm) const {
+ SetupPeerconnectionWithoutLocalStream(tab, certificate_keygen_algorithm);
EXPECT_EQ("ok-added", ExecuteJavascript("addLocalStream()", tab));
}
void WebRtcTestBase::SetupPeerconnectionWithoutLocalStream(
- content::WebContents* tab) const {
+ content::WebContents* tab,
+ std::string certificate_keygen_algorithm) const {
+ if (certificate_keygen_algorithm.empty())
phoglund_chromium 2016/04/27 13:23:12 Remove this if statement now that null is the defa
hbos_chromium 2016/04/27 15:09:08 Done.
+ certificate_keygen_algorithm = "null";
+ std::string javascript = base::StringPrintf(
+ "preparePeerConnection(%s)", certificate_keygen_algorithm.c_str());
EXPECT_EQ("ok-peerconnection-created",
- ExecuteJavascript("preparePeerConnection()", tab));
+ ExecuteJavascript(javascript, tab));
}
std::string WebRtcTestBase::CreateLocalOffer(

Powered by Google App Engine
This is Rietveld 408576698