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

talk/app/webrtc/peerconnection_unittest.cc

Index: talk/app/webrtc/peerconnection_unittest.cc
diff --git a/talk/app/webrtc/peerconnection_unittest.cc b/talk/app/webrtc/peerconnection_unittest.cc
index 99ee9be867168a99ca9f6fe898ce2517aede4a56..79ff4f1dc9f03f8cb188742d61ae8da27c100627 100644
--- a/talk/app/webrtc/peerconnection_unittest.cc
+++ b/talk/app/webrtc/peerconnection_unittest.cc
@@ -40,7 +40,7 @@
 #include "talk/app/webrtc/peerconnectioninterface.h"
 #include "talk/app/webrtc/test/fakeaudiocapturemodule.h"
 #include "talk/app/webrtc/test/fakeconstraints.h"
-#include "talk/app/webrtc/test/fakedtlsidentityservice.h"
+#include "talk/app/webrtc/test/fakedtlsidentitystore.h"
 #include "talk/app/webrtc/test/fakeperiodicvideocapturer.h"
 #include "talk/app/webrtc/test/fakevideotrackrenderer.h"
 #include "talk/app/webrtc/test/mockpeerconnectionobservers.h"
@@ -772,20 +772,20 @@ class JsepTestClient
         remove_sdes_(false) {
   }
 
-  virtual rtc::scoped_refptr<webrtc::PeerConnectionInterface>
-      CreatePeerConnection(webrtc::PortAllocatorFactoryInterface* factory,
-                           const MediaConstraintsInterface* constraints) {
+  rtc::scoped_refptr<webrtc::PeerConnectionInterface>
+      CreatePeerConnection(
+          webrtc::PortAllocatorFactoryInterface* factory,
+          const MediaConstraintsInterface* constraints) override {
     // CreatePeerConnection with IceServers.
     webrtc::PeerConnectionInterface::IceServers ice_servers;
     webrtc::PeerConnectionInterface::IceServer ice_server;
     ice_server.uri = "stun:stun.l.google.com:19302";
     ice_servers.push_back(ice_server);
 
-    FakeIdentityService* dtls_service =
-        rtc::SSLStreamAdapter::HaveDtlsSrtp() ?
-            new FakeIdentityService() : NULL;
+    dtls_identity_store_.reset(rtc::SSLStreamAdapter::HaveDtlsSrtp() ?
+                              new FakeDtlsIdentityStore() : nullptr);
     return peer_connection_factory()->CreatePeerConnection(
-        ice_servers, constraints, factory, dtls_service, this);
+        ice_servers, constraints, factory, dtls_identity_store_.get(), this);
   }
 
   void HandleIncomingOffer(const std::string& msg) {
@@ -898,6 +898,7 @@ class JsepTestClient
 
   rtc::scoped_refptr<DataChannelInterface> data_channel_;
   rtc::scoped_ptr<MockDataChannelObserver> data_observer_;
+  rtc::scoped_ptr<webrtc::DtlsIdentityStoreInterface> dtls_identity_store_;
 };
 
 template <typename SignalingClass>