DtlsIdentityStore[Interface/Impl] updated, DtlsIdentityService to be removed

talk/app/webrtc/peerconnectionfactory_unittest.cc

 /*
  * libjingle
  * Copyright 2012 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 12 matching lines @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <string>
 
 #include "talk/app/webrtc/fakeportallocatorfactory.h"
 #include "talk/app/webrtc/mediastreaminterface.h"
 #include "talk/app/webrtc/peerconnectionfactory.h"
-#include "talk/app/webrtc/test/fakedtlsidentityservice.h"
+#include "talk/app/webrtc/test/fakedtlsidentitystore.h"
 #include "talk/app/webrtc/test/fakevideotrackrenderer.h"
 #include "talk/app/webrtc/videosourceinterface.h"
 #include "talk/media/base/fakevideocapturer.h"
 #include "talk/media/webrtc/webrtccommon.h"
 #include "talk/media/webrtc/webrtcvoe.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/thread.h"
 
+using webrtc::DataChannelInterface;
+using webrtc::DtlsIdentityStoreInterface;
 using webrtc::FakeVideoTrackRenderer;
-using webrtc::DataChannelInterface;
 using webrtc::MediaStreamInterface;
 using webrtc::PeerConnectionFactoryInterface;
 using webrtc::PeerConnectionInterface;
 using webrtc::PeerConnectionObserver;
 using webrtc::PortAllocatorFactoryInterface;
 using webrtc::VideoSourceInterface;
 using webrtc::VideoTrackInterface;
 
 namespace {
 
@@ skipping 95 matching lines @@
 
 // Verify creation of PeerConnection using internal ADM, video factory and
 // internal libjingle threads.
 TEST(PeerConnectionFactoryTestInternal, CreatePCUsingInternalModules) {
   rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
       webrtc::CreatePeerConnectionFactory());
 
   NullPeerConnectionObserver observer;
   webrtc::PeerConnectionInterface::IceServers servers;
 
+  rtc::scoped_ptr<FakeDtlsIdentityStore> dtls_identity_store(
+      new FakeDtlsIdentityStore());
   rtc::scoped_refptr<PeerConnectionInterface> pc(
       factory->CreatePeerConnection(
-          servers, NULL, NULL, new FakeIdentityService(), &observer));
+          servers, nullptr, nullptr, dtls_identity_store.Pass(), &observer));
 
-  EXPECT_TRUE(pc.get() != NULL);
+  EXPECT_TRUE(pc.get() != nullptr);
 }
 
 // This test verifies creation of PeerConnection with valid STUN and TURN
 // configuration. Also verifies the URL's parsed correctly as expected.
 TEST_F(PeerConnectionFactoryTest, CreatePCUsingIceServers) {
   PeerConnectionInterface::RTCConfiguration config;
   webrtc::PeerConnectionInterface::IceServer ice_server;
   ice_server.uri = kStunIceServer;
   config.servers.push_back(ice_server);
   ice_server.uri = kTurnIceServer;
   ice_server.password = kTurnPassword;
   config.servers.push_back(ice_server);
   ice_server.uri = kTurnIceServerWithTransport;
   ice_server.password = kTurnPassword;
   config.servers.push_back(ice_server);
+  rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store(
+      new FakeDtlsIdentityStore());
   rtc::scoped_refptr<PeerConnectionInterface> pc(
-      factory_->CreatePeerConnection(config, NULL,
+      factory_->CreatePeerConnection(config, nullptr,
                                      allocator_factory_.get(),
-                                     new FakeIdentityService(),
+                                     dtls_identity_store.Pass(),
                                      &observer_));
   EXPECT_TRUE(pc.get() != NULL);
   StunConfigurations stun_configs;
   webrtc::PortAllocatorFactoryInterface::StunConfiguration stun1(
       "stun.l.google.com", 19302);
   stun_configs.push_back(stun1);
   VerifyStunConfigurations(stun_configs);
   TurnConfigurations turn_configs;
   webrtc::PortAllocatorFactoryInterface::TurnConfiguration turn1(
       "test.com", 1234, "test@hello.com", kTurnPassword, "udp", false);
   turn_configs.push_back(turn1);
   webrtc::PortAllocatorFactoryInterface::TurnConfiguration turn2(
       "hello.com", kDefaultStunPort, "test", kTurnPassword, "tcp", false);
   turn_configs.push_back(turn2);
   VerifyTurnConfigurations(turn_configs);
 }
 
 // This test verifies creation of PeerConnection with valid STUN and TURN
 // configuration. Also verifies the list of URL's parsed correctly as expected.
 TEST_F(PeerConnectionFactoryTest, CreatePCUsingIceServersUrls) {
   PeerConnectionInterface::RTCConfiguration config;
   webrtc::PeerConnectionInterface::IceServer ice_server;
   ice_server.urls.push_back("");  // Empty URLs should be ignored.
   ice_server.urls.push_back(kStunIceServer);
   ice_server.urls.push_back(kTurnIceServer);
   ice_server.urls.push_back(kTurnIceServerWithTransport);
   ice_server.password = kTurnPassword;
   config.servers.push_back(ice_server);
+  rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store(
+      new FakeDtlsIdentityStore());
   rtc::scoped_refptr<PeerConnectionInterface> pc(
-      factory_->CreatePeerConnection(config, NULL,
+      factory_->CreatePeerConnection(config, nullptr,
                                      allocator_factory_.get(),
-                                     new FakeIdentityService(),
+                                     dtls_identity_store.Pass(),
                                      &observer_));
   EXPECT_TRUE(pc.get() != NULL);
   StunConfigurations stun_configs;
   webrtc::PortAllocatorFactoryInterface::StunConfiguration stun1(
       "stun.l.google.com", 19302);
   stun_configs.push_back(stun1);
   VerifyStunConfigurations(stun_configs);
   TurnConfigurations turn_configs;
   webrtc::PortAllocatorFactoryInterface::TurnConfiguration turn1(
       "test.com", 1234, "test@hello.com", kTurnPassword, "udp", false);
@@ skipping 12 matching lines @@
   webrtc::PeerConnectionInterface::IceServers ice_servers;
   webrtc::PeerConnectionInterface::IceServer ice_server;
   ice_server.uri = kStunIceServer;
   ice_servers.push_back(ice_server);
   ice_server.uri = kTurnIceServer;
   ice_server.password = kTurnPassword;
   ice_servers.push_back(ice_server);
   ice_server.uri = kTurnIceServerWithTransport;
   ice_server.password = kTurnPassword;
   ice_servers.push_back(ice_server);
+  rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store(
+      new FakeDtlsIdentityStore());
   rtc::scoped_refptr<PeerConnectionInterface> pc(
-      factory_->CreatePeerConnection(ice_servers, NULL,
+      factory_->CreatePeerConnection(ice_servers, nullptr,
                                      allocator_factory_.get(),
-                                     new FakeIdentityService(),
+                                     dtls_identity_store.Pass(),
                                      &observer_));
   EXPECT_TRUE(pc.get() != NULL);
   StunConfigurations stun_configs;
   webrtc::PortAllocatorFactoryInterface::StunConfiguration stun1(
       "stun.l.google.com", 19302);
   stun_configs.push_back(stun1);
   VerifyStunConfigurations(stun_configs);
   TurnConfigurations turn_configs;
   webrtc::PortAllocatorFactoryInterface::TurnConfiguration turn1(
       "test.com", 1234, "test@hello.com", kTurnPassword, "udp", false);
   turn_configs.push_back(turn1);
   webrtc::PortAllocatorFactoryInterface::TurnConfiguration turn2(
       "hello.com", kDefaultStunPort, "test", kTurnPassword, "tcp", false);
   turn_configs.push_back(turn2);
   VerifyTurnConfigurations(turn_configs);
 }
 
 TEST_F(PeerConnectionFactoryTest, CreatePCUsingNoUsernameInUri) {
   PeerConnectionInterface::RTCConfiguration config;
   webrtc::PeerConnectionInterface::IceServer ice_server;
   ice_server.uri = kStunIceServer;
   config.servers.push_back(ice_server);
   ice_server.uri = kTurnIceServerWithNoUsernameInUri;
   ice_server.username = kTurnUsername;
   ice_server.password = kTurnPassword;
   config.servers.push_back(ice_server);
+  rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store(
+      new FakeDtlsIdentityStore());
   rtc::scoped_refptr<PeerConnectionInterface> pc(
-      factory_->CreatePeerConnection(config, NULL,
+      factory_->CreatePeerConnection(config, nullptr,
                                      allocator_factory_.get(),
-                                     new FakeIdentityService(),
+                                     dtls_identity_store.Pass(),
                                      &observer_));
   EXPECT_TRUE(pc.get() != NULL);
   TurnConfigurations turn_configs;
   webrtc::PortAllocatorFactoryInterface::TurnConfiguration turn(
       "test.com", 1234, kTurnUsername, kTurnPassword, "udp", false);
   turn_configs.push_back(turn);
   VerifyTurnConfigurations(turn_configs);
 }
 
 // This test verifies the PeerConnection created properly with TURN url which
 // has transport parameter in it.
 TEST_F(PeerConnectionFactoryTest, CreatePCUsingTurnUrlWithTransportParam) {
   PeerConnectionInterface::RTCConfiguration config;
   webrtc::PeerConnectionInterface::IceServer ice_server;
   ice_server.uri = kTurnIceServerWithTransport;
   ice_server.password = kTurnPassword;
   config.servers.push_back(ice_server);
+  rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store(
+      new FakeDtlsIdentityStore());
   rtc::scoped_refptr<PeerConnectionInterface> pc(
-      factory_->CreatePeerConnection(config, NULL,
+      factory_->CreatePeerConnection(config, nullptr,
                                      allocator_factory_.get(),
-                                     new FakeIdentityService(),
+                                     dtls_identity_store.Pass(),
                                      &observer_));
   EXPECT_TRUE(pc.get() != NULL);
   TurnConfigurations turn_configs;
   webrtc::PortAllocatorFactoryInterface::TurnConfiguration turn(
       "hello.com", kDefaultStunPort, "test", kTurnPassword, "tcp", false);
   turn_configs.push_back(turn);
   VerifyTurnConfigurations(turn_configs);
 }
 
 TEST_F(PeerConnectionFactoryTest, CreatePCUsingSecureTurnUrl) {
   PeerConnectionInterface::RTCConfiguration config;
   webrtc::PeerConnectionInterface::IceServer ice_server;
   ice_server.uri = kSecureTurnIceServer;
   ice_server.password = kTurnPassword;
   config.servers.push_back(ice_server);
   ice_server.uri = kSecureTurnIceServerWithoutTransportParam;
   ice_server.password = kTurnPassword;
   config.servers.push_back(ice_server);
   ice_server.uri = kSecureTurnIceServerWithoutTransportAndPortParam;
   ice_server.password = kTurnPassword;
   config.servers.push_back(ice_server);
+  rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store(
+      new FakeDtlsIdentityStore());
   rtc::scoped_refptr<PeerConnectionInterface> pc(
-      factory_->CreatePeerConnection(config, NULL,
+      factory_->CreatePeerConnection(config, nullptr,
                                      allocator_factory_.get(),
-                                     new FakeIdentityService(),
+                                     dtls_identity_store.Pass(),
                                      &observer_));
   EXPECT_TRUE(pc.get() != NULL);
   TurnConfigurations turn_configs;
   webrtc::PortAllocatorFactoryInterface::TurnConfiguration turn1(
       "hello.com", kDefaultStunTlsPort, "test", kTurnPassword, "tcp", true);
   turn_configs.push_back(turn1);
   // TURNS with transport param should be default to tcp.
   webrtc::PortAllocatorFactoryInterface::TurnConfiguration turn2(
       "hello.com", 443, "test_no_transport", kTurnPassword, "tcp", true);
   turn_configs.push_back(turn2);
@@ skipping 13 matching lines @@
   config.servers.push_back(ice_server);
   ice_server.uri = kStunIceServerWithIPv6Address;
   config.servers.push_back(ice_server);
   ice_server.uri = kStunIceServerWithIPv6AddressWithoutPort;
   config.servers.push_back(ice_server);
   ice_server.uri = kStunIceServerWithInvalidIPv6Address;
   config.servers.push_back(ice_server);
   ice_server.uri = kTurnIceServerWithIPv6Address;
   ice_server.password = kTurnPassword;
   config.servers.push_back(ice_server);
+  rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store(
+      new FakeDtlsIdentityStore());
   rtc::scoped_refptr<PeerConnectionInterface> pc(
-      factory_->CreatePeerConnection(config, NULL,
+      factory_->CreatePeerConnection(config, nullptr,
                                      allocator_factory_.get(),
-                                     new FakeIdentityService(),
+                                     dtls_identity_store.Pass(),
                                      &observer_));
   EXPECT_TRUE(pc.get() != NULL);
   StunConfigurations stun_configs;
   webrtc::PortAllocatorFactoryInterface::StunConfiguration stun1(
       "1.2.3.4", 1234);
   stun_configs.push_back(stun1);
   webrtc::PortAllocatorFactoryInterface::StunConfiguration stun2(
       "1.2.3.4", 3478);
   stun_configs.push_back(stun2);  // Default port
   webrtc::PortAllocatorFactoryInterface::StunConfiguration stun3(
@@ skipping 30 matching lines @@
 
   track->set_enabled(false);
   EXPECT_TRUE(capturer->CaptureFrame());
   EXPECT_EQ(1, local_renderer.num_rendered_frames());
 
   track->set_enabled(true);
   EXPECT_TRUE(capturer->CaptureFrame());
   EXPECT_EQ(2, local_renderer.num_rendered_frames());
 }