| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/webrtc_browsertest_base.h" | 7 #include "chrome/browser/media/webrtc/webrtc_browsertest_base.h" |
| 8 #include "chrome/browser/media/webrtc/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" |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 OpenDatabase(left_tab_); | 81 OpenDatabase(left_tab_); |
| 82 GenerateAndCloneCertificate(left_tab_, cert_keygen_alg); | 82 GenerateAndCloneCertificate(left_tab_, cert_keygen_alg); |
| 83 CloseDatabase(left_tab_); | 83 CloseDatabase(left_tab_); |
| 84 DeleteDatabase(left_tab_); | 84 DeleteDatabase(left_tab_); |
| 85 | 85 |
| 86 SetupPeerconnectionWithCertificateAndLocalStream( | 86 SetupPeerconnectionWithCertificateAndLocalStream( |
| 87 left_tab_, "gCertificateClone"); | 87 left_tab_, "gCertificateClone"); |
| 88 SetupPeerconnectionWithLocalStream(right_tab_, cert_keygen_alg); | 88 SetupPeerconnectionWithLocalStream(right_tab_, cert_keygen_alg); |
| 89 | 89 |
| 90 NegotiateCall(left_tab_, right_tab_); | 90 NegotiateCall(left_tab_, right_tab_); |
| 91 VerifyLocalDescriptionContainsCertificate(left_tab_, "gCertificate"); |
| 91 | 92 |
| 92 DetectVideoAndHangUp(); | 93 DetectVideoAndHangUp(); |
| 93 } | 94 } |
| 94 | 95 |
| 95 protected: | 96 protected: |
| 96 void StartServerAndOpenTabs() { | 97 void StartServerAndOpenTabs() { |
| 97 ASSERT_TRUE(embedded_test_server()->Start()); | 98 ASSERT_TRUE(embedded_test_server()->Start()); |
| 98 left_tab_ = OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); | 99 left_tab_ = OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); |
| 99 right_tab_ = OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); | 100 right_tab_ = OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); |
| 100 } | 101 } |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 238 SetupPeerconnectionWithLocalStream(left_tab_); | 239 SetupPeerconnectionWithLocalStream(left_tab_); |
| 239 SetupPeerconnectionWithLocalStream(right_tab_); | 240 SetupPeerconnectionWithLocalStream(right_tab_); |
| 240 NegotiateCall(left_tab_, right_tab_); | 241 NegotiateCall(left_tab_, right_tab_); |
| 241 | 242 |
| 242 std::string ice_gatheringstate = | 243 std::string ice_gatheringstate = |
| 243 ExecuteJavascript("getLastGatheringState()", left_tab_); | 244 ExecuteJavascript("getLastGatheringState()", left_tab_); |
| 244 | 245 |
| 245 EXPECT_EQ("complete", ice_gatheringstate); | 246 EXPECT_EQ("complete", ice_gatheringstate); |
| 246 DetectVideoAndHangUp(); | 247 DetectVideoAndHangUp(); |
| 247 } | 248 } |
| OLD | NEW |