Bug 1595637 - P2. Remove nsIIdentChannel from nsBaseChannel. r=mayhemer

It was only needed when used with DocumentChannelChild.

Differential Revision: https://phabricator.services.mozilla.com/D52784

--HG--
extra : moz-landing-system : lando

netwerk/base/nsBaseChannel.cpp

@@ -353,7 +353,6 @@ NS_IMPL_RELEASE(nsBaseChannel)
 NS_INTERFACE_MAP_BEGIN(nsBaseChannel)
   NS_INTERFACE_MAP_ENTRY(nsIRequest)
   NS_INTERFACE_MAP_ENTRY(nsIChannel)
-  NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsIIdentChannel, mChannelId.isSome())
   NS_INTERFACE_MAP_ENTRY(nsIThreadRetargetableRequest)
   NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
   NS_INTERFACE_MAP_ENTRY(nsITransportEventSink)
@@ -708,27 +707,6 @@ nsBaseChannel::AsyncOpen(nsIStreamListener* aListener) {
   return NS_OK;
 }
 
-//-----------------------------------------------------------------------------
-// nsBaseChannel::nsIIdentChannel
-
-NS_IMETHODIMP
-nsBaseChannel::GetChannelId(uint64_t* aChannelId) {
-  if (!mChannelId) {
-    return NS_ERROR_NOT_IMPLEMENTED;
-  }
-  *aChannelId = *mChannelId;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsBaseChannel::SetChannelId(uint64_t aChannelId) {
-  if (!mChannelId) {
-    return NS_ERROR_NOT_IMPLEMENTED;
-  }
-  *mChannelId = aChannelId;
-  return NS_OK;
-}
-
 //-----------------------------------------------------------------------------
 // nsBaseChannel::nsITransportEventSink
 

netwerk/base/nsBaseChannel.h

@@ -42,16 +42,10 @@ class nsIInputStream;
 //
 // nsBaseChannel implements nsITransportEventSink to support progress & status
 // notifications generated by the transport layer.
-//
-// nsBaseChannel will only implement nsIIdentChannel if mChannelId is set.
-// It is required for devtools to capture transfer information for network
-// connection, and not all nsBaseChannel implementation should be logged.
-// Currently only DocumentChannelChild implements nsIIdentChannel via
-// nsBaseChannel.
 
 class nsBaseChannel
     : public nsHashPropertyBag,
-      public nsIIdentChannel,
+      public nsIChannel,
       public nsIThreadRetargetableRequest,
       public nsIInterfaceRequestor,
       public nsITransportEventSink,
@@ -64,7 +58,6 @@ class nsBaseChannel
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIREQUEST
   NS_DECL_NSICHANNEL
-  NS_DECL_NSIIDENTCHANNEL
   NS_DECL_NSIINTERFACEREQUESTOR
   NS_DECL_NSITRANSPORTEVENTSINK
   NS_DECL_NSIASYNCVERIFYREDIRECTCALLBACK
@@ -307,7 +300,6 @@ class nsBaseChannel
   uint32_t mContentDispositionHint;
   nsAutoPtr<nsString> mContentDispositionFilename;
   int64_t mContentLength;
-  mozilla::Maybe<uint64_t> mChannelId;
   bool mWasOpened;
 
   friend class mozilla::net::PrivateBrowsingChannel<nsBaseChannel>;