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

talk/app/webrtc/webrtcsessiondescriptionfactory.h

Index: talk/app/webrtc/webrtcsessiondescriptionfactory.h
diff --git a/talk/app/webrtc/webrtcsessiondescriptionfactory.h b/talk/app/webrtc/webrtcsessiondescriptionfactory.h
index 41798a485fb6c7604cd512ad13d035c78e0513f0..672b7bbd490677c67abc3e91e6dc489933e48fcc 100644
--- a/talk/app/webrtc/webrtcsessiondescriptionfactory.h
+++ b/talk/app/webrtc/webrtcsessiondescriptionfactory.h
@@ -28,9 +28,10 @@
 #ifndef TALK_APP_WEBRTC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_
 #define TALK_APP_WEBRTC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_
 
+#include "talk/app/webrtc/dtlsidentitystore.h"
 #include "talk/app/webrtc/peerconnectioninterface.h"
-#include "webrtc/p2p/base/transportdescriptionfactory.h"
 #include "talk/session/media/mediasession.h"
+#include "webrtc/p2p/base/transportdescriptionfactory.h"
 #include "webrtc/base/messagehandler.h"
 
 namespace cricket {
@@ -46,10 +47,10 @@ class SessionDescriptionInterface;
 class WebRtcSession;
 
 // DTLS identity request callback class.
-class WebRtcIdentityRequestObserver : public DTLSIdentityRequestObserver,
+class WebRtcIdentityRequestObserver : public DtlsIdentityRequestObserver,
                                       public sigslot::has_slots<> {
  public:
-  // DTLSIdentityRequestObserver overrides.
+  // DtlsIdentityRequestObserver overrides.
   void OnFailure(int error) override;
   void OnSuccess(const std::string& der_cert,
                  const std::string& der_private_key) override;
@@ -91,7 +92,7 @@ class WebRtcSessionDescriptionFactory : public rtc::MessageHandler,
       rtc::Thread* signaling_thread,
       cricket::ChannelManager* channel_manager,
       MediaStreamSignaling* mediastream_signaling,
-      DTLSIdentityServiceInterface* dtls_identity_service,
+      DtlsIdentityStoreInterface* dtls_identity_store,
       // TODO(jiayl): remove the dependency on session once b/10226852 is fixed.
       WebRtcSession* session,
       const std::string& session_id,
@@ -150,7 +151,7 @@ class WebRtcSessionDescriptionFactory : public rtc::MessageHandler,
   cricket::TransportDescriptionFactory transport_desc_factory_;
   cricket::MediaSessionDescriptionFactory session_desc_factory_;
   uint64 session_version_;
-  rtc::scoped_ptr<DTLSIdentityServiceInterface> identity_service_;
+  DtlsIdentityStoreInterface* dtls_identity_store_;
   rtc::scoped_refptr<WebRtcIdentityRequestObserver>
       identity_request_observer_;
   WebRtcSession* session_;