Added DtlsCertificate, a ref counted object owning an SSLIdentity

webrtc/p2p/base/transportdescriptionfactory_unittest.cc

Index: webrtc/p2p/base/transportdescriptionfactory_unittest.cc
diff --git a/webrtc/p2p/base/transportdescriptionfactory_unittest.cc b/webrtc/p2p/base/transportdescriptionfactory_unittest.cc
index 48267b57bb2d18dfed105ada476582e633fa3214..cdd7913f7d72e5686debbc9dad46f141e73b1856 100644
--- a/webrtc/p2p/base/transportdescriptionfactory_unittest.cc
+++ b/webrtc/p2p/base/transportdescriptionfactory_unittest.cc
@@ -26,8 +26,12 @@ using cricket::TransportOptions;
 class TransportDescriptionFactoryTest : public testing::Test {
  public:
   TransportDescriptionFactoryTest()
-      : id1_(new rtc::FakeSSLIdentity("User1")),
-        id2_(new rtc::FakeSSLIdentity("User2")) {
+      : cert1_(webrtc::DtlsCertificate::Create(
+          rtc::scoped_ptr<rtc::SSLIdentity>(
+              new rtc::FakeSSLIdentity("User1")).Pass())),
+        cert2_(webrtc::DtlsCertificate::Create(
+          rtc::scoped_ptr<rtc::SSLIdentity>(
+              new rtc::FakeSSLIdentity("User2")).Pass())) {
   }
 
   void CheckDesc(const TransportDescription* desc, const std::string& type,
@@ -62,8 +66,8 @@ class TransportDescriptionFactoryTest : public testing::Test {
     if (dtls) {
       f1_.set_secure(cricket::SEC_ENABLED);
       f2_.set_secure(cricket::SEC_ENABLED);
-      f1_.set_identity(id1_.get());
-      f2_.set_identity(id2_.get());
+      f1_.set_certificate(cert1_.get());
+      f2_.set_certificate(cert2_.get());
     } else {
       f1_.set_secure(cricket::SEC_DISABLED);
       f2_.set_secure(cricket::SEC_DISABLED);
@@ -114,8 +118,8 @@ class TransportDescriptionFactoryTest : public testing::Test {
  protected:
   TransportDescriptionFactory f1_;
   TransportDescriptionFactory f2_;
-  scoped_ptr<rtc::SSLIdentity> id1_;
-  scoped_ptr<rtc::SSLIdentity> id2_;
+  rtc::scoped_refptr<webrtc::DtlsCertificate> cert1_;
+  rtc::scoped_refptr<webrtc::DtlsCertificate> cert2_;
 };
 
 // Test that in the default case, we generate the expected G-ICE offer.
@@ -146,9 +150,10 @@ TEST_F(TransportDescriptionFactoryTest, TestOfferIce) {
 TEST_F(TransportDescriptionFactoryTest, TestOfferHybridDtls) {
   f1_.set_protocol(cricket::ICEPROTO_HYBRID);
   f1_.set_secure(cricket::SEC_ENABLED);
-  f1_.set_identity(id1_.get());
+  f1_.set_certificate(cert1_.get());
   std::string digest_alg;
-  ASSERT_TRUE(id1_->certificate().GetSignatureDigestAlgorithm(&digest_alg));
+  ASSERT_TRUE(cert1_->identity()->certificate().GetSignatureDigestAlgorithm(
+      &digest_alg));
   scoped_ptr<TransportDescription> desc(f1_.CreateOffer(
       TransportOptions(), NULL));
   CheckDesc(desc.get(), cricket::NS_JINGLE_ICE_UDP, "google-ice", "", "",
@@ -174,9 +179,10 @@ TEST_F(TransportDescriptionFactoryTest, TestOfferHybridDtlsWithNoIdentity) {
 TEST_F(TransportDescriptionFactoryTest, TestOfferHybridDtlsReofferIceDtls) {
   f1_.set_protocol(cricket::ICEPROTO_HYBRID);
   f1_.set_secure(cricket::SEC_ENABLED);
-  f1_.set_identity(id1_.get());
+  f1_.set_certificate(cert1_.get());
   std::string digest_alg;
-  ASSERT_TRUE(id1_->certificate().GetSignatureDigestAlgorithm(&digest_alg));
+  ASSERT_TRUE(cert1_->identity()->certificate().GetSignatureDigestAlgorithm(
+      &digest_alg));
   scoped_ptr<TransportDescription> old_desc(f1_.CreateOffer(
       TransportOptions(), NULL));
   ASSERT_TRUE(old_desc.get() != NULL);
@@ -296,7 +302,7 @@ TEST_F(TransportDescriptionFactoryTest, TestAnswerIceToIceReanswer) {
 TEST_F(TransportDescriptionFactoryTest, TestAnswerHybridToHybridDtls) {
   f1_.set_protocol(cricket::ICEPROTO_HYBRID);
   f1_.set_secure(cricket::SEC_ENABLED);
-  f1_.set_identity(id1_.get());
+  f1_.set_certificate(cert1_.get());
   f2_.set_protocol(cricket::ICEPROTO_HYBRID);
   scoped_ptr<TransportDescription> offer(
       f1_.CreateOffer(TransportOptions(), NULL));
@@ -312,7 +318,7 @@ TEST_F(TransportDescriptionFactoryTest, TestAnswerHybridDtlsToHybrid) {
   f1_.set_protocol(cricket::ICEPROTO_HYBRID);
   f2_.set_protocol(cricket::ICEPROTO_HYBRID);
   f2_.set_secure(cricket::SEC_ENABLED);
-  f2_.set_identity(id2_.get());
+  f2_.set_certificate(cert2_.get());
   scoped_ptr<TransportDescription> offer(
       f1_.CreateOffer(TransportOptions(), NULL));
   ASSERT_TRUE(offer.get() != NULL);
@@ -330,15 +336,16 @@ TEST_F(TransportDescriptionFactoryTest, TestAnswerHybridDtlsToHybrid) {
 TEST_F(TransportDescriptionFactoryTest, TestAnswerHybridDtlsToHybridDtls) {
   f1_.set_protocol(cricket::ICEPROTO_HYBRID);
   f1_.set_secure(cricket::SEC_ENABLED);
-  f1_.set_identity(id1_.get());
+  f1_.set_certificate(cert1_.get());
 
   f2_.set_protocol(cricket::ICEPROTO_HYBRID);
   f2_.set_secure(cricket::SEC_ENABLED);
-  f2_.set_identity(id2_.get());
+  f2_.set_certificate(cert2_.get());
   // f2_ produces the answer that is being checked in this test, so the
-  // answer must contain fingerprint lines with id2_'s digest algorithm.
+  // answer must contain fingerprint lines with cert2_'s digest algorithm.
   std::string digest_alg2;
-  ASSERT_TRUE(id2_->certificate().GetSignatureDigestAlgorithm(&digest_alg2));
+  ASSERT_TRUE(cert2_->identity()->certificate().GetSignatureDigestAlgorithm(
+      &digest_alg2));
 
   scoped_ptr<TransportDescription> offer(
       f1_.CreateOffer(TransportOptions(), NULL));