Backed out changeset 98a1ef2f2b30 (bug 1414829) for merge conflict

media/webrtc/signaling/gtest/mediaconduit_unittests.cpp

@@ -540,8 +540,6 @@ class TransportConduitTest : public ::testing::Test
 
     err = videoSession->ConfigureSendMediaCodec(nullptr);
     EXPECT_TRUE(err != mozilla::kMediaConduitNoError);
-
-    videoSession->DeleteStreams();
   }
 
  private:

media/webrtc/signaling/src/media-conduit/AudioConduit.h

@@ -169,8 +169,6 @@ public:
   virtual uint64_t CodecPluginID() override { return 0; }
   virtual void SetPCHandle(const std::string& aPCHandle) override {}
 
-  virtual void DeleteStreams() override {}
-
   explicit WebrtcAudioConduit():
                       mVoiceEngine(nullptr),
                       mTransportMonitor("WebrtcAudioConduit"),

media/webrtc/signaling/src/media-conduit/MediaConduitInterface.h

@@ -284,8 +284,6 @@ public:
 
   virtual void SetPCHandle(const std::string& aPCHandle) = 0;
 
-  virtual void DeleteStreams() = 0;
-
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MediaSessionConduit)
 
 };

media/webrtc/signaling/src/media-conduit/VideoConduit.cpp

@@ -318,7 +318,7 @@ WebrtcVideoConduit::~WebrtcVideoConduit()
 
   // Release AudioConduit first by dropping reference on MainThread, where it expects to be
   SyncTo(nullptr);
-  MOZ_ASSERT(!mSendStream && !mRecvStream, "Call DeleteStreams prior to ~WebrtcVideoConduit.");
+  Destroy();
 }
 
 void
@@ -1193,7 +1193,7 @@ WebrtcVideoConduit::Init()
 }
 
 void
-WebrtcVideoConduit::DeleteStreams()
+WebrtcVideoConduit::Destroy()
 {
   // We can't delete the VideoEngine until all these are released!
   // And we can't use a Scoped ptr, since the order is arbitrary

media/webrtc/signaling/src/media-conduit/VideoConduit.h

@@ -256,8 +256,6 @@ public:
     mPCHandle = aPCHandle;
   }
 
-  virtual void DeleteStreams() override;
-
   unsigned int SendingMaxFs() override {
     if(mCurSendCodecConfig) {
       return mCurSendCodecConfig->mEncodingConstraints.maxFs;
@@ -294,6 +292,7 @@ public:
 
   MediaConduitErrorCode InitMain();
   virtual MediaConduitErrorCode Init();
+  virtual void Destroy();
 
   std::vector<unsigned int> GetLocalSSRCs() const override;
   bool SetLocalSSRCs(const std::vector<unsigned int> & ssrcs) override;

media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp

@@ -1110,10 +1110,6 @@ PeerConnectionMedia::SelfDestruct_m()
   mLocalSourceStreams.Clear();
   mRemoteSourceStreams.Clear();
 
-  for (auto i = mConduits.begin(); i != mConduits.end(); ++i) {
-    i->second.second->DeleteStreams();
-  }
-
   mMainThread = nullptr;
 
   // Final self-destruct.