Index: talk/app/webrtc/webrtcsessiondescriptionfactory.h |
diff --git a/talk/app/webrtc/webrtcsessiondescriptionfactory.h b/talk/app/webrtc/webrtcsessiondescriptionfactory.h |
index 41798a485fb6c7604cd512ad13d035c78e0513f0..04035054594abab89ccefebbe8cc099810313d0d 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,15 +47,14 @@ 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; |
- void OnSuccessWithIdentityObj( |
- rtc::scoped_ptr<rtc::SSLIdentity> identity) override; |
+ void OnSuccess(rtc::scoped_ptr<rtc::SSLIdentity> identity) override; |
sigslot::signal1<int> SignalRequestFailed; |
sigslot::signal1<rtc::SSLIdentity*> SignalIdentityReady; |
@@ -85,13 +85,13 @@ struct CreateSessionDescriptionRequest { |
// request has completed, i.e. when OnIdentityRequestFailed or OnIdentityReady |
// is called. |
class WebRtcSessionDescriptionFactory : public rtc::MessageHandler, |
- public sigslot::has_slots<> { |
+ public sigslot::has_slots<> { |
public: |
WebRtcSessionDescriptionFactory( |
rtc::Thread* signaling_thread, |
cricket::ChannelManager* channel_manager, |
MediaStreamSignaling* mediastream_signaling, |
- DTLSIdentityServiceInterface* dtls_identity_service, |
+ rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store, |
// TODO(jiayl): remove the dependency on session once b/10226852 is fixed. |
tommi
2015/07/02 11:23:00
this bug has been closed now... can you check the
hbos
2015/07/02 12:28:28
It has been moved to https://code.google.com/p/web
tommi
2015/07/09 16:13:56
just write bug 2264 :)
hbos
2015/07/27 13:29:00
Acknowledged.
|
WebRtcSession* session, |
const std::string& session_id, |
@@ -150,7 +150,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_; |
+ rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store_; |
rtc::scoped_refptr<WebRtcIdentityRequestObserver> |
identity_request_observer_; |
WebRtcSession* session_; |