Backed out 3 changesets (bug 1791633) for causing bustages on TransportSecurityInfo.cpp. CLOSED TREE

Backed out changeset 23b864e14db0 (bug 1791633)
Backed out changeset 0bcba3375ec0 (bug 1791633)
Backed out changeset ab0ea0d68f5c (bug 1791633)

Author: Marian-Vasile Laza

dom/media/webrtc/transport/test/webrtcproxychannel_unittest.cpp

@@ -85,7 +85,7 @@ class FakeSocketTransportProvider : public nsISocketTransport {
     return NS_OK;
   }
   NS_IMETHOD GetTlsSocketControl(
-      nsITLSSocketControl** aTLSSocketControl) override {
+      nsISSLSocketControl** aTLSSocketControl) override {
     MOZ_ASSERT(false);
     return NS_OK;
   }

dom/network/TCPSocket.cpp

@@ -4,12 +4,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "TCPServerSocket.h"
+#include "mozilla/BasePrincipal.h"
+#include "mozilla/ErrorResult.h"
 #include "TCPSocket.h"
+#include "TCPServerSocket.h"
 #include "TCPSocketChild.h"
 #include "TCPSocketParent.h"
-#include "mozilla/BasePrincipal.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/RootedDictionary.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/dom/TCPSocketBinding.h"
@@ -21,24 +21,24 @@
 #include "nsComponentManagerUtils.h"
 #include "nsContentUtils.h"
 #include "nsIArrayBufferInputStream.h"
-#include "nsIAsyncInputStream.h"
+#include "nsISocketTransportService.h"
+#include "nsISocketTransport.h"
+#include "nsIMultiplexInputStream.h"
 #include "nsIAsyncStreamCopier.h"
-#include "nsIBinaryInputStream.h"
-#include "nsICancelable.h"
-#include "nsIChannel.h"
 #include "nsIInputStream.h"
 #include "nsIInputStreamPump.h"
-#include "nsIMultiplexInputStream.h"
-#include "nsINSSErrorsService.h"
-#include "nsIObserverService.h"
-#include "nsIOutputStream.h"
-#include "nsIProtocolProxyService.h"
+#include "nsIBinaryInputStream.h"
 #include "nsIScriptableInputStream.h"
-#include "nsISocketTransport.h"
-#include "nsISocketTransportService.h"
+#include "nsIAsyncInputStream.h"
 #include "nsISupportsPrimitives.h"
-#include "nsITLSSocketControl.h"
 #include "nsITransport.h"
+#include "nsIObserverService.h"
+#include "nsIOutputStream.h"
+#include "nsINSSErrorsService.h"
+#include "nsISSLSocketControl.h"
+#include "nsIProtocolProxyService.h"
+#include "nsICancelable.h"
+#include "nsIChannel.h"
 #include "nsIURIMutator.h"
 #include "nsNetCID.h"
 #include "nsNetUtil.h"
@@ -455,7 +455,7 @@ void TCPSocket::NotifyCopyComplete(nsresult aStatus) {
 }
 
 void TCPSocket::ActivateTLS() {
-  nsCOMPtr<nsITLSSocketControl> tlsSocketControl;
+  nsCOMPtr<nsISSLSocketControl> tlsSocketControl;
   mTransport->GetTlsSocketControl(getter_AddRefs(tlsSocketControl));
   if (tlsSocketControl) {
     tlsSocketControl->StartTLS();

ipc/glue/TransportSecurityInfoUtils.cpp

@@ -6,7 +6,6 @@
 
 #include "ipc/IPCMessageUtils.h"
 #include "mozilla/psm/TransportSecurityInfo.h"
-#include "nsNSSCertificate.h"
 
 namespace IPC {
 

ipc/glue/TransportSecurityInfoUtils.h

@@ -5,7 +5,6 @@
 #ifndef mozilla_ipc_TransportSecurityInfoUtils_h
 #define mozilla_ipc_TransportSecurityInfoUtils_h
 
-#include "ipc/EnumSerializer.h"
 #include "mozilla/RefPtr.h"
 #include "nsITransportSecurityInfo.h"
 #include "nsIX509Cert.h"
@@ -31,13 +30,6 @@ struct ParamTraits<nsIX509Cert*> {
   static bool Read(MessageReader* aReader, RefPtr<nsIX509Cert>* aResult);
 };
 
-template <>
-struct ParamTraits<nsITransportSecurityInfo::OverridableErrorCategory>
-    : public ContiguousEnumSerializerInclusive<
-          nsITransportSecurityInfo::OverridableErrorCategory,
-          nsITransportSecurityInfo::OverridableErrorCategory::ERROR_UNSET,
-          nsITransportSecurityInfo::OverridableErrorCategory::ERROR_TIME> {};
-
 }  // namespace IPC
 
 #endif  // mozilla_ipc_TransportSecurityInfoUtils_h