| 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 06e452afa69c5f357d392a494b0e4b38c026087a..46697703b8ce2e3ce0eb3ddb12ae13e0d63624e9 100644
|
| --- a/chrome/browser/media/webrtc_browsertest_base.cc
|
| +++ b/chrome/browser/media/webrtc_browsertest_base.cc
|
| @@ -306,18 +306,32 @@ std::string WebRtcTestBase::ExecuteJavascript(
|
|
|
| void WebRtcTestBase::SetupPeerconnectionWithLocalStream(
|
| content::WebContents* tab,
|
| - std::string certificate_keygen_algorithm) const {
|
| + const std::string& certificate_keygen_algorithm) const {
|
| SetupPeerconnectionWithoutLocalStream(tab, certificate_keygen_algorithm);
|
| EXPECT_EQ("ok-added", ExecuteJavascript("addLocalStream()", tab));
|
| }
|
|
|
| void WebRtcTestBase::SetupPeerconnectionWithoutLocalStream(
|
| content::WebContents* tab,
|
| - std::string certificate_keygen_algorithm) const {
|
| + const std::string& certificate_keygen_algorithm) const {
|
| std::string javascript = base::StringPrintf(
|
| "preparePeerConnection(%s)", certificate_keygen_algorithm.c_str());
|
| - EXPECT_EQ("ok-peerconnection-created",
|
| - ExecuteJavascript(javascript, tab));
|
| + EXPECT_EQ("ok-peerconnection-created", ExecuteJavascript(javascript, tab));
|
| +}
|
| +
|
| +void WebRtcTestBase::SetupPeerconnectionWithCertificateAndLocalStream(
|
| + content::WebContents* tab,
|
| + const std::string& certificate) const {
|
| + SetupPeerconnectionWithCertificateWithoutLocalStream(tab, certificate);
|
| + EXPECT_EQ("ok-added", ExecuteJavascript("addLocalStream()", tab));
|
| +}
|
| +
|
| +void WebRtcTestBase::SetupPeerconnectionWithCertificateWithoutLocalStream(
|
| + content::WebContents* tab,
|
| + const std::string& certificate) const {
|
| + std::string javascript = base::StringPrintf(
|
| + "preparePeerConnectionWithCertificate(%s)", certificate.c_str());
|
| + EXPECT_EQ("ok-peerconnection-created", ExecuteJavascript(javascript, tab));
|
| }
|
|
|
| std::string WebRtcTestBase::CreateLocalOffer(
|
| @@ -451,3 +465,30 @@ bool WebRtcTestBase::OnWin8() const {
|
| return false;
|
| #endif
|
| }
|
| +
|
| +void WebRtcTestBase::OpenDatabase(content::WebContents* tab) const {
|
| + std::string response = ExecuteJavascript("openDatabase()", tab);
|
| + EXPECT_EQ("ok-", response.substr(0, 3)) << "Failed to open database: "
|
| + << response;
|
| +}
|
| +
|
| +void WebRtcTestBase::CloseDatabase(content::WebContents* tab) const {
|
| + std::string response = ExecuteJavascript("closeDatabase()", tab);
|
| + EXPECT_EQ("ok-", response.substr(0, 3)) << "Failed to close database: "
|
| + << response;
|
| +}
|
| +
|
| +void WebRtcTestBase::DeleteDatabase(content::WebContents* tab) const {
|
| + std::string response = ExecuteJavascript("deleteDatabase()", tab);
|
| + EXPECT_EQ("ok-", response.substr(0, 3)) << "Failed to delete database: "
|
| + << response;
|
| +}
|
| +
|
| +void WebRtcTestBase::GenerateAndCloneCertificate(
|
| + content::WebContents* tab, const std::string& keygen_algorithm) const {
|
| + std::string javascript = base::StringPrintf(
|
| + "generateAndCloneCertificate(%s)", keygen_algorithm.c_str());
|
| + std::string response = ExecuteJavascript(javascript, tab);
|
| + EXPECT_EQ("ok-", response.substr(0, 3)) << "Failed to generate and clone "
|
| + "certificate: " << response;
|
| +}
|
|
|