| Index: webrtc/api/peerconnectionfactory_unittest.cc
|
| diff --git a/webrtc/api/peerconnectionfactory_unittest.cc b/webrtc/api/peerconnectionfactory_unittest.cc
|
| index de21e806d556877de3620b19ad11a9d944e3152a..d5aa603fd46c410656853956ca94ddf0ad9e8683 100644
|
| --- a/webrtc/api/peerconnectionfactory_unittest.cc
|
| +++ b/webrtc/api/peerconnectionfactory_unittest.cc
|
| @@ -142,8 +142,9 @@ TEST(PeerConnectionFactoryTestInternal, CreatePCUsingInternalModules) {
|
|
|
| std::unique_ptr<FakeDtlsIdentityStore> dtls_identity_store(
|
| new FakeDtlsIdentityStore());
|
| - rtc::scoped_refptr<PeerConnectionInterface> pc(factory->CreatePeerConnection(
|
| - config, nullptr, nullptr, std::move(dtls_identity_store), &observer));
|
| + rtc::scoped_refptr<PeerConnectionInterface> pc(
|
| + factory->CreatePeerConnectionWithStore(
|
| + config, nullptr, nullptr, std::move(dtls_identity_store), &observer));
|
|
|
| EXPECT_TRUE(pc.get() != nullptr);
|
| }
|
| @@ -163,9 +164,10 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingIceServers) {
|
| config.servers.push_back(ice_server);
|
| std::unique_ptr<DtlsIdentityStoreInterface> dtls_identity_store(
|
| new FakeDtlsIdentityStore());
|
| - rtc::scoped_refptr<PeerConnectionInterface> pc(factory_->CreatePeerConnection(
|
| - config, nullptr, std::move(port_allocator_),
|
| - std::move(dtls_identity_store), &observer_));
|
| + rtc::scoped_refptr<PeerConnectionInterface> pc(
|
| + factory_->CreatePeerConnectionWithStore(
|
| + config, nullptr, std::move(port_allocator_),
|
| + std::move(dtls_identity_store), &observer_));
|
| ASSERT_TRUE(pc.get() != NULL);
|
| cricket::ServerAddresses stun_servers;
|
| rtc::SocketAddress stun1("stun.l.google.com", 19302);
|
| @@ -193,9 +195,10 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingIceServersUrls) {
|
| config.servers.push_back(ice_server);
|
| std::unique_ptr<DtlsIdentityStoreInterface> dtls_identity_store(
|
| new FakeDtlsIdentityStore());
|
| - rtc::scoped_refptr<PeerConnectionInterface> pc(factory_->CreatePeerConnection(
|
| - config, nullptr, std::move(port_allocator_),
|
| - std::move(dtls_identity_store), &observer_));
|
| + rtc::scoped_refptr<PeerConnectionInterface> pc(
|
| + factory_->CreatePeerConnectionWithStore(
|
| + config, nullptr, std::move(port_allocator_),
|
| + std::move(dtls_identity_store), &observer_));
|
| ASSERT_TRUE(pc.get() != NULL);
|
| cricket::ServerAddresses stun_servers;
|
| rtc::SocketAddress stun1("stun.l.google.com", 19302);
|
| @@ -222,9 +225,10 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingNoUsernameInUri) {
|
| config.servers.push_back(ice_server);
|
| std::unique_ptr<DtlsIdentityStoreInterface> dtls_identity_store(
|
| new FakeDtlsIdentityStore());
|
| - rtc::scoped_refptr<PeerConnectionInterface> pc(factory_->CreatePeerConnection(
|
| - config, nullptr, std::move(port_allocator_),
|
| - std::move(dtls_identity_store), &observer_));
|
| + rtc::scoped_refptr<PeerConnectionInterface> pc(
|
| + factory_->CreatePeerConnectionWithStore(
|
| + config, nullptr, std::move(port_allocator_),
|
| + std::move(dtls_identity_store), &observer_));
|
| ASSERT_TRUE(pc.get() != NULL);
|
| std::vector<cricket::RelayServerConfig> turn_servers;
|
| cricket::RelayServerConfig turn("test.com", 1234, kTurnUsername,
|
| @@ -243,9 +247,10 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingTurnUrlWithTransportParam) {
|
| config.servers.push_back(ice_server);
|
| std::unique_ptr<DtlsIdentityStoreInterface> dtls_identity_store(
|
| new FakeDtlsIdentityStore());
|
| - rtc::scoped_refptr<PeerConnectionInterface> pc(factory_->CreatePeerConnection(
|
| - config, nullptr, std::move(port_allocator_),
|
| - std::move(dtls_identity_store), &observer_));
|
| + rtc::scoped_refptr<PeerConnectionInterface> pc(
|
| + factory_->CreatePeerConnectionWithStore(
|
| + config, nullptr, std::move(port_allocator_),
|
| + std::move(dtls_identity_store), &observer_));
|
| ASSERT_TRUE(pc.get() != NULL);
|
| std::vector<cricket::RelayServerConfig> turn_servers;
|
| cricket::RelayServerConfig turn("hello.com", kDefaultStunPort, "test",
|
| @@ -268,9 +273,10 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingSecureTurnUrl) {
|
| config.servers.push_back(ice_server);
|
| std::unique_ptr<DtlsIdentityStoreInterface> dtls_identity_store(
|
| new FakeDtlsIdentityStore());
|
| - rtc::scoped_refptr<PeerConnectionInterface> pc(factory_->CreatePeerConnection(
|
| - config, nullptr, std::move(port_allocator_),
|
| - std::move(dtls_identity_store), &observer_));
|
| + rtc::scoped_refptr<PeerConnectionInterface> pc(
|
| + factory_->CreatePeerConnectionWithStore(
|
| + config, nullptr, std::move(port_allocator_),
|
| + std::move(dtls_identity_store), &observer_));
|
| ASSERT_TRUE(pc.get() != NULL);
|
| std::vector<cricket::RelayServerConfig> turn_servers;
|
| cricket::RelayServerConfig turn1("hello.com", kDefaultStunTlsPort, "test",
|
| @@ -303,9 +309,10 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingIPLiteralAddress) {
|
| config.servers.push_back(ice_server);
|
| std::unique_ptr<DtlsIdentityStoreInterface> dtls_identity_store(
|
| new FakeDtlsIdentityStore());
|
| - rtc::scoped_refptr<PeerConnectionInterface> pc(factory_->CreatePeerConnection(
|
| - config, nullptr, std::move(port_allocator_),
|
| - std::move(dtls_identity_store), &observer_));
|
| + rtc::scoped_refptr<PeerConnectionInterface> pc(
|
| + factory_->CreatePeerConnectionWithStore(
|
| + config, nullptr, std::move(port_allocator_),
|
| + std::move(dtls_identity_store), &observer_));
|
| ASSERT_TRUE(pc.get() != NULL);
|
| cricket::ServerAddresses stun_servers;
|
| rtc::SocketAddress stun1("1.2.3.4", 1234);
|
|
|