Bug 1028588 - Fix dangerous public destructors in netwerk/ - r=mcmanus

netwerk/base/src/ArrayBufferInputStream.h

@@ -22,12 +22,12 @@
 class ArrayBufferInputStream : public nsIArrayBufferInputStream {
 public:
   ArrayBufferInputStream();
-  virtual ~ArrayBufferInputStream() {}
   NS_DECL_ISUPPORTS
   NS_DECL_NSIARRAYBUFFERINPUTSTREAM
   NS_DECL_NSIINPUTSTREAM
 
 private:
+  virtual ~ArrayBufferInputStream() {}
   mozilla::Maybe<JS::PersistentRooted<JS::Value> > mArrayBuffer;
   uint8_t* mBuffer; // start of actual buffer
   uint32_t mBufferLength; // length of slice

netwerk/base/src/BackgroundFileSaver.h

@@ -398,12 +398,13 @@ public:
   NS_DECL_NSIOUTPUTSTREAM
   // Constructor. Neither parameter may be null. The caller owns both.
   DigestOutputStream(nsIOutputStream* outputStream, PK11Context* aContext);
-  ~DigestOutputStream();
 
   // We don't own any NSS objects here, so no need to clean up
   void virtualDestroyNSSReference() { }
 
 private:
+  ~DigestOutputStream();
+
   // Calls to write are passed to this stream.
   nsCOMPtr<nsIOutputStream> mOutputStream;
   // Digest context used to compute the hash, owned by the caller.

netwerk/base/src/Dashboard.cpp

@@ -39,15 +39,16 @@ public:
         mThread = nullptr;
     }
 
-    virtual ~SocketData()
-    {
-    }
-
     uint64_t mTotalSent;
     uint64_t mTotalRecv;
     nsTArray<SocketInfo> mData;
     nsMainThreadPtrHandle<NetDashboardCallback> mCallback;
     nsIThread *mThread;
+
+private:
+    virtual ~SocketData()
+    {
+    }
 };
 
 NS_IMPL_ISUPPORTS0(SocketData)
@@ -56,6 +57,10 @@ NS_IMPL_ISUPPORTS0(SocketData)
 class HttpData
     : public nsISupports
 {
+    virtual ~HttpData()
+    {
+    }
+
 public:
     NS_DECL_THREADSAFE_ISUPPORTS
 
@@ -64,10 +69,6 @@ public:
         mThread = nullptr;
     }
 
-    virtual ~HttpData()
-    {
-    }
-
     nsTArray<HttpRetParams> mData;
     nsMainThreadPtrHandle<NetDashboardCallback> mCallback;
     nsIThread *mThread;
@@ -79,6 +80,10 @@ NS_IMPL_ISUPPORTS0(HttpData)
 class WebSocketRequest
     : public nsISupports
 {
+    virtual ~WebSocketRequest()
+    {
+    }
+
 public:
     NS_DECL_THREADSAFE_ISUPPORTS
 
@@ -87,10 +92,6 @@ public:
         mThread = nullptr;
     }
 
-    virtual ~WebSocketRequest()
-    {
-    }
-
     nsMainThreadPtrHandle<NetDashboardCallback> mCallback;
     nsIThread *mThread;
 };
@@ -101,6 +102,10 @@ NS_IMPL_ISUPPORTS0(WebSocketRequest)
 class DnsData
     : public nsISupports
 {
+    virtual ~DnsData()
+    {
+    }
+
 public:
     NS_DECL_THREADSAFE_ISUPPORTS
 
@@ -109,10 +114,6 @@ public:
         mThread = nullptr;
     }
 
-    virtual ~DnsData()
-    {
-    }
-
     nsTArray<DNSCacheEntries> mData;
     nsMainThreadPtrHandle<NetDashboardCallback> mCallback;
     nsIThread *mThread;
@@ -125,6 +126,13 @@ class ConnectionData
     : public nsITransportEventSink
     , public nsITimerCallback
 {
+    virtual ~ConnectionData()
+    {
+        if (mTimer) {
+            mTimer->Cancel();
+        }
+    }
+
 public:
     NS_DECL_THREADSAFE_ISUPPORTS
     NS_DECL_NSITRANSPORTEVENTSINK
@@ -139,13 +147,6 @@ public:
         mDashboard = target;
     }
 
-    virtual ~ConnectionData()
-    {
-        if (mTimer) {
-            mTimer->Cancel();
-        }
-    }
-
     nsCOMPtr<nsISocketTransport> mSocket;
     nsCOMPtr<nsIInputStream> mStreamIn;
     nsCOMPtr<nsITimer> mTimer;
@@ -228,6 +229,10 @@ class LookupHelper;
 class LookupArgument
     : public nsISupports
 {
+    virtual ~LookupArgument()
+    {
+    }
+
 public:
     NS_DECL_THREADSAFE_ISUPPORTS
 
@@ -237,10 +242,6 @@ public:
         mHelper = aHelper;
     }
 
-    virtual ~LookupArgument()
-    {
-    }
-
     nsCOMPtr<nsIDNSRecord> mRecord;
     nsRefPtr<LookupHelper> mHelper;
 };
@@ -251,13 +252,6 @@ NS_IMPL_ISUPPORTS0(LookupArgument)
 class LookupHelper
     : public nsIDNSListener
 {
-public:
-    NS_DECL_THREADSAFE_ISUPPORTS
-    NS_DECL_NSIDNSLISTENER
-
-    LookupHelper() {
-    }
-
     virtual ~LookupHelper()
     {
         if (mCancel) {
@@ -265,6 +259,13 @@ public:
         }
     }
 
+public:
+    NS_DECL_THREADSAFE_ISUPPORTS
+    NS_DECL_NSIDNSLISTENER
+
+    LookupHelper() {
+    }
+
     nsresult ConstructAnswer(LookupArgument *aArgument);
 public:
     nsCOMPtr<nsICancelable> mCancel;

netwerk/base/src/EventTokenBucket.cpp

@@ -35,10 +35,11 @@ public:
   NS_DECL_NSICANCELABLE
 
   TokenBucketCancelable(class ATokenBucketEvent *event);
-  virtual ~TokenBucketCancelable() {}
   void Fire();
 
 private:
+  virtual ~TokenBucketCancelable() {}
+
   friend class EventTokenBucket;
   ATokenBucketEvent *mEvent;
 };

netwerk/base/src/EventTokenBucket.h

@@ -69,13 +69,14 @@ class TokenBucketCancelable;
 
 class EventTokenBucket : public nsITimerCallback
 {
+  virtual ~EventTokenBucket();
+
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSITIMERCALLBACK
 
   // This should be constructed on the main thread
   EventTokenBucket(uint32_t eventsPerSecond, uint32_t burstSize);
-  virtual ~EventTokenBucket();
 
   // These public methods are all meant to be called from the socket thread
   void ClearCredits();

netwerk/base/src/Predictor.cpp

@@ -150,6 +150,7 @@ public:
   PredictorDNSListener()
   { }
 
+private:
   virtual ~PredictorDNSListener()
   { }
 };

netwerk/base/src/Predictor.h

@@ -49,13 +49,14 @@ public:
   NS_DECL_NSIINTERFACEREQUESTOR
 
   Predictor();
-  virtual ~Predictor();
 
   nsresult Init();
   void Shutdown();
   static nsresult Create(nsISupports *outer, const nsIID& iid, void **result);
 
 private:
+  virtual ~Predictor();
+
   friend class PredictionEvent;
   friend class LearnEvent;
   friend class PredictorResetEvent;

netwerk/base/src/ProxyAutoConfig.cpp

@@ -287,6 +287,9 @@ public:
   nsCOMPtr<nsICancelable> mRequest;
   nsCOMPtr<nsIDNSRecord>  mResponse;
   nsCOMPtr<nsITimer>      mTimer;
+
+private:
+  ~PACResolver() {}
 };
 NS_IMPL_ISUPPORTS(PACResolver, nsIDNSListener, nsITimerCallback)
 

netwerk/base/src/RedirectChannelRegistrar.h

@@ -22,6 +22,9 @@ class RedirectChannelRegistrar MOZ_FINAL : public nsIRedirectChannelRegistrar
 
   RedirectChannelRegistrar();
 
+private:
+  ~RedirectChannelRegistrar() {}
+
 protected:
   typedef nsInterfaceHashtable<nsUint32HashKey, nsIChannel>
           ChannelHashtable;

netwerk/base/src/StreamingProtocolService.h

@@ -19,12 +19,14 @@ namespace net {
  */
 class StreamingProtocolControllerService : public nsIStreamingProtocolControllerService
 {
+private:
+  virtual ~StreamingProtocolControllerService() {};
+
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSISTREAMINGPROTOCOLCONTROLLERSERVICE
 
   StreamingProtocolControllerService() {};
-  virtual ~StreamingProtocolControllerService() {};
   static already_AddRefed<StreamingProtocolControllerService> GetInstance();
 };
 } // namespace dom

netwerk/base/src/Tickler.h

@@ -66,7 +66,6 @@ public:
 
   // These methods are main thread only
   Tickler();
-  ~Tickler();
   void Cancel();
   nsresult Init();
   void SetIPV4Address(uint32_t address);
@@ -77,6 +76,8 @@ public:
   void Tickle();
 
 private:
+  ~Tickler();
+
   friend class TicklerTimer;
   Mutex mLock;
   nsCOMPtr<nsIThread> mThread;
@@ -110,11 +111,11 @@ NS_DEFINE_STATIC_IID_ACCESSOR(Tickler, NS_TICKLER_IID)
 
 class Tickler MOZ_FINAL : public nsISupports
 {
+  ~Tickler() { }
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
 
   Tickler() { }
-  ~Tickler() { }
   nsresult Init() { return NS_ERROR_NOT_IMPLEMENTED; }
   void Cancel() { }
   void SetIPV4Address(uint32_t) { };

netwerk/base/src/nsAsyncStreamCopier.h

@@ -33,7 +33,6 @@ public:
                     bool aCloseSink);
 
     nsAsyncStreamCopier();
-    virtual ~nsAsyncStreamCopier();
 
     //-------------------------------------------------------------------------
     // these methods may be called on any thread
@@ -42,6 +41,8 @@ public:
     void   Complete(nsresult status);
 
 private:
+    virtual ~nsAsyncStreamCopier();
+
     nsresult InitInternal(nsIInputStream *source,
                           nsIOutputStream *sink,
                           nsIEventTarget *target,

netwerk/base/src/nsAuthInformationHolder.h

@@ -10,14 +10,16 @@
 #include "nsString.h"
 
 class nsAuthInformationHolder : public nsIAuthInformation {
+
+protected:
+    virtual ~nsAuthInformationHolder() {}
+
 public:
     // aAuthType must be ASCII
     nsAuthInformationHolder(uint32_t aFlags, const nsString& aRealm,
                             const nsCString& aAuthType)
         : mFlags(aFlags), mRealm(aRealm), mAuthType(aAuthType) {}
 
-    virtual ~nsAuthInformationHolder() {}
-
     NS_DECL_ISUPPORTS
     NS_DECL_NSIAUTHINFORMATION
 

netwerk/base/src/nsBufferedStreams.h

@@ -24,11 +24,12 @@ public:
     NS_DECL_NSISEEKABLESTREAM
 
     nsBufferedStream();
-    virtual ~nsBufferedStream();
 
     nsresult Close();
 
 protected:
+    virtual ~nsBufferedStream();
+
     nsresult Init(nsISupports* stream, uint32_t bufferSize);
     NS_IMETHOD Fill() = 0;
     NS_IMETHOD Flush() = 0;

netwerk/base/src/nsDNSPrefetch.h

@@ -18,6 +18,8 @@ class nsIDNSService;
 
 class nsDNSPrefetch MOZ_FINAL : public nsIDNSListener
 {
+    ~nsDNSPrefetch() {}
+
 public:
     NS_DECL_THREADSAFE_ISUPPORTS
     NS_DECL_NSIDNSLISTENER

netwerk/base/src/nsFileStreams.h

@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+// /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
@@ -31,9 +31,10 @@ public:
     NS_DECL_NSIFILEMETADATA
 
     nsFileStreamBase();
-    virtual ~nsFileStreamBase();
 
 protected:
+    virtual ~nsFileStreamBase();
+
     nsresult Close();
     nsresult Available(uint64_t* _retval);
     nsresult Read(char* aBuf, uint32_t aCount, uint32_t* _retval);

netwerk/base/src/nsIOService.cpp

@@ -1179,6 +1179,8 @@ nsIOService::ExtractCharsetFromContentType(const nsACString &aTypeHeader,
 // nsISpeculativeConnect
 class IOServiceProxyCallback MOZ_FINAL : public nsIProtocolProxyCallback
 {
+    ~IOServiceProxyCallback() {}
+
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSIPROTOCOLPROXYCALLBACK

netwerk/base/src/nsInputStreamPump.h

@@ -21,6 +21,8 @@ class nsInputStreamPump MOZ_FINAL : public nsIInputStreamPump
                                   , public nsIInputStreamCallback
                                   , public nsIThreadRetargetableRequest
 {
+    ~nsInputStreamPump();
+
 public:
     typedef mozilla::ReentrantMonitorAutoEnter ReentrantMonitorAutoEnter;
     NS_DECL_THREADSAFE_ISUPPORTS
@@ -30,7 +32,6 @@ public:
     NS_DECL_NSITHREADRETARGETABLEREQUEST
 
     nsInputStreamPump(); 
-    ~nsInputStreamPump();
 
     static nsresult
                       Create(nsInputStreamPump  **result,

netwerk/base/src/nsLoadGroup.cpp

@@ -1098,6 +1098,8 @@ nsresult nsLoadGroup::MergeLoadFlags(nsIRequest *aRequest, nsLoadFlags& outFlags
 
 class nsLoadGroupConnectionInfo MOZ_FINAL : public nsILoadGroupConnectionInfo
 {
+    ~nsLoadGroupConnectionInfo() {}
+
 public:
     NS_DECL_THREADSAFE_ISUPPORTS
     NS_DECL_NSILOADGROUPCONNECTIONINFO

netwerk/base/src/nsMIMEInputStream.cpp

@@ -28,9 +28,10 @@ class nsMIMEInputStream : public nsIMIMEInputStream,
                           public nsISeekableStream,
                           public nsIIPCSerializableInputStream
 {
+    virtual ~nsMIMEInputStream();
+
 public:
     nsMIMEInputStream();
-    virtual ~nsMIMEInputStream();
 
     NS_DECL_THREADSAFE_ISUPPORTS
     NS_DECL_NSIINPUTSTREAM

netwerk/base/src/nsNetAddr.h

@@ -13,6 +13,8 @@
 
 class nsNetAddr MOZ_FINAL : public nsINetAddr
 {
+  ~nsNetAddr() {}
+
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSINETADDR

netwerk/base/src/nsProtocolProxyService.cpp

@@ -91,6 +91,7 @@ public:
         NS_ASSERTION(mCallback, "null callback");
     }
 
+private:
     ~nsAsyncResolveRequest()
     {
         if (!NS_IsMainThread()) {
@@ -127,6 +128,7 @@ public:
         }
     }
 
+public:
     void SetResult(nsresult status, nsIProxyInfo *pi)
     {
         mStatus = status;

netwerk/base/src/nsRequestObserverProxy.h

@@ -17,6 +17,8 @@ class nsARequestObserverEvent;
 
 class nsRequestObserverProxy MOZ_FINAL : public nsIRequestObserverProxy
 {
+    ~nsRequestObserverProxy() {}
+
 public:
     NS_DECL_THREADSAFE_ISUPPORTS
     NS_DECL_NSIREQUESTOBSERVER

netwerk/base/src/nsSerializationHelper.h

@@ -29,6 +29,8 @@ nsresult NS_DeserializeObject(const nsCSubstring& str,
 
 class nsSerializationHelper MOZ_FINAL : public nsISerializationHelper
 {
+  ~nsSerializationHelper() {}
+
   NS_DECL_ISUPPORTS
   NS_DECL_NSISERIALIZATIONHELPER
 };

netwerk/base/src/nsServerSocket.cpp

@@ -407,6 +407,8 @@ namespace {
 
 class ServerSocketListenerProxy MOZ_FINAL : public nsIServerSocketListener
 {
+  ~ServerSocketListenerProxy() {}
+
 public:
   ServerSocketListenerProxy(nsIServerSocketListener* aListener)
     : mListener(new nsMainThreadPtrHolder<nsIServerSocketListener>(aListener))

netwerk/base/src/nsServerSocket.h

@@ -29,10 +29,9 @@ public:
   virtual uint64_t ByteCountReceived() { return 0; }
   nsServerSocket();
 
-  // This must be public to support older compilers (xlC_r on AIX)
+private:
   virtual ~nsServerSocket();
 
-private:
   void OnMsgClose();
   void OnMsgAttach();
   

netwerk/base/src/nsSimpleNestedURI.h

@@ -23,6 +23,9 @@
 class nsSimpleNestedURI : public nsSimpleURI,
                           public nsINestedURI
 {
+protected:
+    ~nsSimpleNestedURI() {}
+
 public:
     // To be used by deserialization only.  Leaves this object in an
     // uninitialized state that will throw on most accesses.

netwerk/base/src/nsSimpleStreamListener.h

@@ -16,9 +16,10 @@ public:
     NS_DECL_NSISIMPLESTREAMLISTENER
 
     nsSimpleStreamListener() { }
-    virtual ~nsSimpleStreamListener() {}
 
 protected:
+    virtual ~nsSimpleStreamListener() {}
+
     nsCOMPtr<nsIOutputStream>    mSink;
     nsCOMPtr<nsIRequestObserver> mObserver;
 };

netwerk/base/src/nsSimpleURI.h

@@ -30,6 +30,9 @@ class nsSimpleURI : public nsIURI,
                     public nsISizeOf,
                     public nsIIPCSerializableURI
 {
+protected:
+    virtual ~nsSimpleURI();
+
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSIURI
@@ -41,7 +44,6 @@ public:
     // nsSimpleURI methods:
 
     nsSimpleURI();
-    virtual ~nsSimpleURI();
 
     // nsISizeOf
     // Among the sub-classes that inherit (directly or indirectly) from

netwerk/base/src/nsStandardURL.h

@@ -43,6 +43,9 @@ class nsStandardURL : public nsIFileURL
                     , public nsISizeOf
                     , public nsIIPCSerializableURI
 {
+protected:
+    virtual ~nsStandardURL();
+
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSIURI
@@ -59,7 +62,6 @@ public:
     virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
 
     nsStandardURL(bool aSupportsFileURL = false);
-    virtual ~nsStandardURL();
 
     static void InitGlobalObjects();
     static void ShutdownGlobalObjects();
@@ -93,6 +95,8 @@ public: /* internal -- HPUX compiler can't handle this being private */
     //
     class nsPrefObserver MOZ_FINAL : public nsIObserver
     {
+        ~nsPrefObserver() {}
+
     public:
         NS_DECL_ISUPPORTS
         NS_DECL_NSIOBSERVER

netwerk/base/src/nsStreamListenerTee.h

@@ -23,9 +23,10 @@ public:
     NS_DECL_NSISTREAMLISTENERTEE
 
     nsStreamListenerTee() { }
-    virtual ~nsStreamListenerTee() { }
 
 private:
+    virtual ~nsStreamListenerTee() { }
+
     nsCOMPtr<nsIInputStreamTee>  mInputTee;
     nsCOMPtr<nsIOutputStream>    mSink;
     nsCOMPtr<nsIStreamListener>  mListener;

netwerk/base/src/nsStreamLoader.h

@@ -21,12 +21,13 @@ public:
   NS_DECL_NSISTREAMLISTENER
 
   nsStreamLoader();
-  ~nsStreamLoader();
 
   static nsresult
   Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
 
 protected:
+  ~nsStreamLoader();
+
   static NS_METHOD WriteSegmentFun(nsIInputStream *, void *, const char *,
                                    uint32_t, uint32_t, uint32_t *);
 

netwerk/base/src/nsStreamTransportService.cpp

@@ -48,11 +48,11 @@ public:
     {
     }
 
+private:
     virtual ~nsInputStreamTransport()
     {
     }
 
-private:
     nsCOMPtr<nsIAsyncInputStream>   mPipeIn;
 
     // while the copy is active, these members may only be accessed from the
@@ -248,11 +248,11 @@ public:
     {
     }
 
+private:
     virtual ~nsOutputStreamTransport()
     {
     }
 
-private:
     nsCOMPtr<nsIAsyncOutputStream>  mPipeOut;
  
     // while the copy is active, these members may only be accessed from the

netwerk/base/src/nsTemporaryFileInputStream.h

@@ -41,12 +41,12 @@ public:
 
   nsTemporaryFileInputStream(FileDescOwner* aFileDescOwner, uint64_t aStartPos, uint64_t aEndPos);
 
-  virtual ~nsTemporaryFileInputStream() { }
-
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIINPUTSTREAM
 
 private:
+  virtual ~nsTemporaryFileInputStream() { }
+
   nsRefPtr<FileDescOwner> mFileDescOwner;
   uint64_t mStartPos;
   uint64_t mEndPos;

netwerk/base/src/nsTransportUtils.cpp

@@ -34,6 +34,7 @@ public:
         NS_ADDREF(mSink);
     }
 
+private:
     virtual ~nsTransportEventSinkProxy()
     {
         // our reference to mSink could be the last, so be sure to release
@@ -41,6 +42,7 @@ public:
         NS_ProxyRelease(mTarget, mSink);
     }
 
+public:
     nsITransportEventSink           *mSink;
     nsCOMPtr<nsIEventTarget>         mTarget;
     Mutex                            mLock;

netwerk/base/src/nsUDPSocket.cpp

@@ -386,6 +386,8 @@ public:
   NS_DECL_NSIUDPMESSAGE
 
 private:
+  ~UDPMessageProxy() {}
+
   NetAddr mAddr;
   nsCOMPtr<nsIOutputStream> mOutputStream;
   FallibleTArray<uint8_t> mData;
@@ -676,6 +678,8 @@ namespace {
 //-----------------------------------------------------------------------------
 class SocketListenerProxy MOZ_FINAL : public nsIUDPSocketListener
 {
+  ~SocketListenerProxy() {}
+
 public:
   SocketListenerProxy(nsIUDPSocketListener* aListener)
     : mListener(new nsMainThreadPtrHolder<nsIUDPSocketListener>(aListener))
@@ -790,9 +794,9 @@ public:
     mData.SwapElements(aData);
   }
 
+private:
   virtual ~PendingSend() {}
 
-private:
   nsRefPtr<nsUDPSocket> mSocket;
   uint16_t mPort;
   FallibleTArray<uint8_t> mData;

netwerk/base/src/nsUDPSocket.h

@@ -33,10 +33,9 @@ public:
 
   nsUDPSocket();
 
-  // This must be public to support older compilers (xlC_r on AIX)
+private:
   virtual ~nsUDPSocket();
 
-private:
   void OnMsgClose();
   void OnMsgAttach();
 
@@ -99,9 +98,10 @@ public:
   nsUDPOutputStream(nsUDPSocket* aSocket,
                     PRFileDesc* aFD,
                     PRNetAddr& aPrClientAddr);
-  virtual ~nsUDPOutputStream();
 
 private:
+  virtual ~nsUDPOutputStream();
+
   nsRefPtr<nsUDPSocket>       mSocket;
   PRFileDesc                  *mFD;
   PRNetAddr                   mPrClientAddr;

netwerk/base/src/nsURIChecker.h

@@ -20,9 +20,10 @@ class nsURIChecker : public nsIURIChecker,
                      public nsIChannelEventSink,
                      public nsIInterfaceRequestor
 {
+    virtual ~nsURIChecker() {}
+
 public:
     nsURIChecker();
-    virtual ~nsURIChecker() {}
 
     NS_DECL_ISUPPORTS
     NS_DECL_NSIURICHECKER

netwerk/base/src/nsURLParsers.h

@@ -42,6 +42,8 @@ protected:
 
 class nsNoAuthURLParser MOZ_FINAL : public nsBaseURLParser
 {
+    ~nsNoAuthURLParser() {}
+
 public:
     NS_DECL_THREADSAFE_ISUPPORTS
 
@@ -74,11 +76,12 @@ public:
 
 class nsAuthURLParser : public nsBaseURLParser
 {
+protected:
+    virtual ~nsAuthURLParser() {}
+
 public:
     NS_DECL_THREADSAFE_ISUPPORTS
 
-    virtual ~nsAuthURLParser() {}
-
     NS_IMETHOD ParseAuthority(const char *auth, int32_t authLen,
                               uint32_t *usernamePos, int32_t *usernameLen,
                               uint32_t *passwordPos, int32_t *passwordLen,
@@ -110,6 +113,8 @@ public:
 
 class nsStdURLParser : public nsAuthURLParser
 {
+    virtual ~nsStdURLParser() {}
+
 public: 
     void ParseAfterScheme(const char *spec, int32_t specLen,
                           uint32_t *authPos, int32_t *authLen,

netwerk/base/src/nsUnicharStreamLoader.h

@@ -23,11 +23,12 @@ public:
   NS_DECL_NSISTREAMLISTENER
 
   nsUnicharStreamLoader() {}
-  virtual ~nsUnicharStreamLoader() {}
 
   static nsresult Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
 
 protected:
+  virtual ~nsUnicharStreamLoader() {}
+
   nsresult DetermineCharset();
 
   /**

netwerk/cache/nsApplicationCache.h

@@ -16,11 +16,11 @@ public:
 
   nsApplicationCache();
 
-  virtual ~nsApplicationCache();
-
   void MarkInvalid();
 
 private:
+  virtual ~nsApplicationCache();
+
   nsRefPtr<nsOfflineCacheDevice> mDevice;
   nsCString mGroup;
   nsCString mClientID;

netwerk/cache/nsApplicationCacheService.cpp

@@ -27,6 +27,10 @@ nsApplicationCacheService::nsApplicationCacheService()
     mCacheService = nsCacheService::GlobalInstance();
 }
 
+nsApplicationCacheService::~nsApplicationCacheService()
+{
+}
+
 NS_IMETHODIMP
 nsApplicationCacheService::BuildGroupID(nsIURI *aManifestURL,
                                         nsILoadContextInfo *aLoadContextInfo,
@@ -225,6 +229,9 @@ public:
 
         return cacheService->DiscardByAppId(appId, browserOnly);
     }
+
+private:
+    ~AppCacheClearDataObserver() {}
 };
 
 NS_IMPL_ISUPPORTS(AppCacheClearDataObserver, nsIObserver)

netwerk/cache/nsApplicationCacheService.h

@@ -21,6 +21,7 @@ public:
     static void AppClearDataObserverInit();
 
 private:
+    ~nsApplicationCacheService();
     nsRefPtr<nsCacheService> mCacheService;
 };
 

netwerk/cache/nsCacheEntry.h

@@ -243,11 +243,12 @@ public:
     {
     }
 
-    virtual ~nsCacheEntryInfo() {}
     void    DetachEntry() { mCacheEntry = nullptr; }
-    
+
 private:
     nsCacheEntry * mCacheEntry;
+
+    virtual ~nsCacheEntryInfo() {}
 };
 
 

netwerk/cache/nsCacheEntryDescriptor.h

@@ -33,7 +33,6 @@ public:
     friend class nsCacheService;
 
     nsCacheEntryDescriptor(nsCacheEntry * entry, nsCacheAccessMode  mode);
-    virtual ~nsCacheEntryDescriptor();
     
     /**
      * utility method to attempt changing data size of associated entry
@@ -66,6 +65,8 @@ public:
     }
 
 private:
+    virtual ~nsCacheEntryDescriptor();
+
      /*************************************************************************
       * input stream wrapper class -
       *
@@ -93,12 +94,13 @@ private:
          {
              NS_ADDREF(mDescriptor);
          }
+
+     private:
          virtual ~nsInputStreamWrapper()
          {
              NS_IF_RELEASE(mDescriptor);
          }
 
-     private:
          nsresult LazyInit();
          nsresult EnsureInit();
          nsresult Read_Locked(char *buf, uint32_t count, uint32_t *countRead);
@@ -126,13 +128,13 @@ private:
           , mStreamEnded(false)
          {
          }
+         NS_IMETHOD Read(char* buf, uint32_t count, uint32_t * result);
+         NS_IMETHOD Close();
+     private:
          virtual ~nsDecompressInputStreamWrapper()
          {
              Close();
          }
-         NS_IMETHOD Read(char* buf, uint32_t count, uint32_t * result);
-         NS_IMETHOD Close();
-     private:
          nsresult InitZstream();
          nsresult EndZstream();
      };
@@ -165,6 +167,8 @@ private:
          {
              NS_ADDREF(mDescriptor); // owning ref
          }
+
+     private:
          virtual ~nsOutputStreamWrapper()
          {
              Close();
@@ -173,7 +177,6 @@ private:
              NS_ASSERTION(!mDescriptor, "Bad state");
          }
 
-     private:
          nsresult LazyInit();
          nsresult EnsureInit();
          nsresult OnWrite(uint32_t count);
@@ -206,13 +209,13 @@ private:
           , mUncompressedCount(0)
          {
          }
+         NS_IMETHOD Write(const char* buf, uint32_t count, uint32_t * result);
+         NS_IMETHOD Close();
+     private:
          virtual ~nsCompressOutputStreamWrapper()
          { 
              Close();
          }
-         NS_IMETHOD Write(const char* buf, uint32_t count, uint32_t * result);
-         NS_IMETHOD Close();
-     private:
          nsresult InitZstream();
          nsresult WriteBuffer();
      };

netwerk/cache/nsCacheService.cpp

@@ -120,6 +120,8 @@ const int32_t PRE_GECKO_2_0_DEFAULT_CACHE_SIZE = 50 * 1024;
 
 class nsCacheProfilePrefObserver : public nsIObserver
 {
+    virtual ~nsCacheProfilePrefObserver() {}
+
 public:
     NS_DECL_THREADSAFE_ISUPPORTS
     NS_DECL_NSIOBSERVER
@@ -141,8 +143,6 @@ public:
         , mClearCacheOnShutdown(false)
     {
     }
-
-    virtual ~nsCacheProfilePrefObserver() {}
     
     nsresult        Install();
     void            Remove();
@@ -205,6 +205,8 @@ NS_IMPL_ISUPPORTS(nsCacheProfilePrefObserver, nsIObserver)
 
 class nsSetDiskSmartSizeCallback MOZ_FINAL : public nsITimerCallback
 {
+    ~nsSetDiskSmartSizeCallback() {}
+
 public:
     NS_DECL_THREADSAFE_ISUPPORTS
 

netwerk/cache/nsCacheService.h

@@ -65,6 +65,8 @@ private:
 class nsCacheService : public nsICacheServiceInternal,
                        public nsIMemoryReporter
 {
+    virtual ~nsCacheService();
+
 public:
     NS_DECL_THREADSAFE_ISUPPORTS
     NS_DECL_NSICACHESERVICE
@@ -72,7 +74,6 @@ public:
     NS_DECL_NSIMEMORYREPORTER
 
     nsCacheService();
-    virtual ~nsCacheService();
 
     // Define a Create method to be used with a factory:
     static nsresult

netwerk/cache/nsCacheSession.h

@@ -16,12 +16,13 @@
 
 class nsCacheSession : public nsICacheSession
 {
+    virtual ~nsCacheSession();
+
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSICACHESESSION
     
     nsCacheSession(const char * clientID, nsCacheStoragePolicy storagePolicy, bool streamBased);
-    virtual ~nsCacheSession();
     
     nsCString *           ClientID()      { return &mClientID; }
 

netwerk/cache/nsDiskCacheBinding.h

@@ -31,11 +31,12 @@
 class nsDiskCacheDeviceDeactivateEntryEvent;
 
 class nsDiskCacheBinding : public nsISupports, public PRCList {
+    virtual ~nsDiskCacheBinding();
+
 public:
     NS_DECL_THREADSAFE_ISUPPORTS
 
     nsDiskCacheBinding(nsCacheEntry* entry, nsDiskCacheRecord * record);
-    virtual ~nsDiskCacheBinding();
 
     nsresult EnsureStreamIO();
     bool     IsActive() { return mCacheEntry != nullptr;}

netwerk/cache/nsDiskCacheDevice.cpp

@@ -187,9 +187,9 @@ public:
     {
     }
 
-    virtual ~nsDiskCacheDeviceInfo() {}
-    
 private:
+    virtual ~nsDiskCacheDeviceInfo() {}
+
     nsDiskCacheDevice* mDevice;
 };
 

netwerk/cache/nsDiskCacheDeviceSQL.cpp

@@ -280,6 +280,8 @@ public:
   {}
 
 private:
+  ~nsOfflineCacheDeviceInfo() {}
+
   nsOfflineCacheDevice* mDevice;
 };
 
@@ -347,6 +349,8 @@ nsOfflineCacheDeviceInfo::GetMaximumSize(uint32_t *aMaximumSize)
 
 class nsOfflineCacheBinding MOZ_FINAL : public nsISupports
 {
+  ~nsOfflineCacheBinding() {}
+
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
 
@@ -514,6 +518,8 @@ CreateCacheEntry(nsOfflineCacheDevice *device,
 
 class nsOfflineCacheEntryInfo MOZ_FINAL : public nsICacheEntryInfo
 {
+  ~nsOfflineCacheEntryInfo() {}
+
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSICACHEENTRYINFO
@@ -892,6 +898,9 @@ nsOfflineCacheDevice::nsOfflineCacheDevice()
 {
 }
 
+nsOfflineCacheDevice::~nsOfflineCacheDevice()
+{}
+
 /* static */
 bool
 nsOfflineCacheDevice::GetStrictFileOriginPolicy()

netwerk/cache/nsDiskCacheDeviceSQL.h

@@ -35,6 +35,8 @@ public:
   nsApplicationCacheNamespace() : mItemType(0) {}
 
 private:
+  ~nsApplicationCacheNamespace() {}
+
   uint32_t mItemType;
   nsCString mNamespaceSpec;
   nsCString mData;
@@ -53,6 +55,8 @@ public:
   void Apply();
 
 private:
+  ~nsOfflineCacheEvictionFunction() {}
+
   nsOfflineCacheDevice *mDevice;
   nsCOMArray<nsIFile> mItems;
 
@@ -188,8 +192,10 @@ public:
   uint32_t                CacheCapacity() { return mCacheCapacity; }
   uint32_t                CacheSize();
   uint32_t                EntryCount();
-  
+
 private:
+  ~nsOfflineCacheDevice();
+
   friend class nsApplicationCache;
 
   static PLDHashOperator ShutdownApplicationCache(const nsACString &key,

netwerk/cache/nsDiskCacheEntry.h

@@ -86,12 +86,12 @@ public:
         , mDiskEntry(diskEntry)
     {
     }
-
-    virtual ~nsDiskCacheEntryInfo() {}
     
     const char* Key() { return mDiskEntry->Key(); }
     
 private:
+    virtual ~nsDiskCacheEntryInfo() {}
+
     const char *        mDeviceID;
     nsDiskCacheEntry *  mDiskEntry;
 };

netwerk/cache/nsDiskCacheStreams.cpp

@@ -42,12 +42,12 @@ public:
                             const char *          buffer,
                             uint32_t              endOfStream);
 
-    virtual ~nsDiskCacheInputStream();
-    
     NS_DECL_THREADSAFE_ISUPPORTS
     NS_DECL_NSIINPUTSTREAM
 
 private:
+    virtual ~nsDiskCacheInputStream();
+
     nsDiskCacheStreamIO *           mStreamIO;  // backpointer to parent
     PRFileDesc *                    mFD;
     const char *                    mBuffer;

netwerk/cache/nsDiskCacheStreams.h

@@ -23,8 +23,7 @@ class nsDiskCacheDevice;
 
 class nsDiskCacheStreamIO : public nsIOutputStream {
 public:
-             nsDiskCacheStreamIO(nsDiskCacheBinding *   binding);
-    virtual ~nsDiskCacheStreamIO();
+    nsDiskCacheStreamIO(nsDiskCacheBinding *   binding);
     
     NS_DECL_THREADSAFE_ISUPPORTS
     NS_DECL_NSIOUTPUTSTREAM
@@ -48,6 +47,8 @@ public:
     nsDiskCacheStreamIO() { NS_NOTREACHED("oops"); }
 
 private:
+    virtual ~nsDiskCacheStreamIO();
+
     nsresult    OpenCacheFile(int flags, PRFileDesc ** fd);
     nsresult    ReadCacheBlocks(uint32_t bufferSize);
     nsresult    FlushBufferToFile();

netwerk/cache/nsMemoryCacheDevice.h

@@ -115,9 +115,8 @@ public:
     {
     }
 
-    virtual ~nsMemoryCacheDeviceInfo() {}
-    
 private:
+    virtual ~nsMemoryCacheDeviceInfo() {}
     nsMemoryCacheDevice* mDevice;
 };
 

netwerk/cache2/CacheEntry.h

@@ -351,12 +351,12 @@ class CacheEntryHandle : public nsICacheEntry
 {
 public:
   CacheEntryHandle(CacheEntry* aEntry);
-  virtual ~CacheEntryHandle();
   CacheEntry* Entry() const { return mEntry; }
 
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_FORWARD_NSICACHEENTRY(mEntry->)
 private:
+  virtual ~CacheEntryHandle();
   nsRefPtr<CacheEntry> mEntry;
 };
 

netwerk/cache2/CacheIOThread.h

@@ -19,12 +19,13 @@ namespace net {
 
 class CacheIOThread : public nsIThreadObserver
 {
+  virtual ~CacheIOThread();
+
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSITHREADOBSERVER
 
   CacheIOThread();
-  virtual ~CacheIOThread();
 
   enum ELevel {
     OPEN_PRIORITY,

netwerk/cache2/CacheIndex.cpp

@@ -171,14 +171,14 @@ public:
     , mCanceled(false)
   {}
 
-  virtual ~FileOpenHelper() {}
-
   void Cancel() {
     mIndex->AssertOwnsLock();
     mCanceled = true;
   }
 
 private:
+  virtual ~FileOpenHelper() {}
+
   NS_IMETHOD OnFileOpened(CacheFileHandle *aHandle, nsresult aResult);
   NS_IMETHOD OnDataWritten(CacheFileHandle *aHandle, const char *aBuf,
                            nsresult aResult) {

netwerk/cache2/CacheObserver.h

@@ -17,11 +17,11 @@ namespace net {
 class CacheObserver : public nsIObserver
                     , public nsSupportsWeakReference
 {
+  virtual ~CacheObserver() {}
+
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIOBSERVER
 
-  virtual ~CacheObserver() {}
-
   static nsresult Init();
   static nsresult Shutdown();
   static CacheObserver* Self() { return sSelf; }

netwerk/cache2/CacheStorageService.cpp

@@ -1411,9 +1411,10 @@ public:
 
   CacheEntryDoomByKeyCallback(nsICacheEntryDoomCallback* aCallback)
     : mCallback(aCallback) { }
-  virtual ~CacheEntryDoomByKeyCallback();
 
 private:
+  virtual ~CacheEntryDoomByKeyCallback();
+
   NS_IMETHOD OnFileOpened(CacheFileHandle *aHandle, nsresult aResult) { return NS_OK; }
   NS_IMETHOD OnDataWritten(CacheFileHandle *aHandle, const char *aBuf, nsresult aResult) { return NS_OK; }
   NS_IMETHOD OnDataRead(CacheFileHandle *aHandle, char *aBuf, nsresult aResult) { return NS_OK; }

netwerk/cache2/OldWrappers.cpp

@@ -482,10 +482,11 @@ namespace { // anon
 
 class MetaDataVisitorWrapper : public nsICacheMetaDataVisitor
 {
+  virtual ~MetaDataVisitorWrapper() {}
+
   NS_DECL_ISUPPORTS
   NS_DECL_NSICACHEMETADATAVISITOR
   MetaDataVisitorWrapper(nsICacheEntryMetaDataVisitor* cb) : mCB(cb) {}
-  virtual ~MetaDataVisitorWrapper() {}
   nsCOMPtr<nsICacheEntryMetaDataVisitor> mCB;
 };
 

netwerk/cache2/OldWrappers.h

@@ -46,9 +46,9 @@ public:
   _OldCacheEntryWrapper(nsICacheEntryDescriptor* desc);
   _OldCacheEntryWrapper(nsICacheEntryInfo* info);
 
+private:
   virtual ~_OldCacheEntryWrapper();
 
-private:
   _OldCacheEntryWrapper() MOZ_DELETE;
   nsICacheEntryDescriptor* mOldDesc; // ref holded in mOldInfo
   nsCOMPtr<nsICacheEntryInfo> mOldInfo;

netwerk/cookie/CookieServiceChild.h

@@ -27,11 +27,12 @@ public:
   NS_DECL_NSIOBSERVER
 
   CookieServiceChild();
-  virtual ~CookieServiceChild();
 
   static CookieServiceChild* GetSingleton();
 
 protected:
+  virtual ~CookieServiceChild();
+
   void SerializeURIs(nsIURI *aHostURI,
                      nsIChannel *aChannel,
                      nsCString &aHostSpec,

netwerk/cookie/nsCookie.h

@@ -76,8 +76,6 @@ class nsCookie : public nsICookie2
                              bool              aIsSecure,
                              bool              aIsHttpOnly);
 
-    virtual ~nsCookie() {}
-
     size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
 
     // fast (inline, non-xpcom) getters
@@ -103,6 +101,8 @@ class nsCookie : public nsICookie2
     inline void SetCreationTime(int64_t aTime)    { mCreationTime = aTime; }
 
   protected:
+    virtual ~nsCookie() {}
+
     // member variables
     // we use char* ptrs to store the strings in a contiguous block,
     // so we save on the overhead of using nsCStrings. However, we

netwerk/cookie/nsCookieService.cpp

@@ -389,9 +389,11 @@ public:
  ******************************************************************************/
 class InsertCookieDBListener MOZ_FINAL : public DBListenerErrorHandler
 {
-protected:
+private:
   virtual const char *GetOpType() { return "INSERT"; }
 
+  ~InsertCookieDBListener() {}
+
 public:
   NS_DECL_ISUPPORTS
 
@@ -423,9 +425,11 @@ NS_IMPL_ISUPPORTS(InsertCookieDBListener, mozIStorageStatementCallback)
  ******************************************************************************/
 class UpdateCookieDBListener MOZ_FINAL : public DBListenerErrorHandler
 {
-protected:
+private:
   virtual const char *GetOpType() { return "UPDATE"; }
 
+  ~UpdateCookieDBListener() {}
+
 public:
   NS_DECL_ISUPPORTS
 
@@ -449,9 +453,11 @@ NS_IMPL_ISUPPORTS(UpdateCookieDBListener, mozIStorageStatementCallback)
  ******************************************************************************/
 class RemoveCookieDBListener MOZ_FINAL : public DBListenerErrorHandler
 {
-protected:
+private:
   virtual const char *GetOpType() { return "REMOVE"; }
 
+  ~RemoveCookieDBListener() {}
+
 public:
   NS_DECL_ISUPPORTS
 
@@ -475,10 +481,12 @@ NS_IMPL_ISUPPORTS(RemoveCookieDBListener, mozIStorageStatementCallback)
  ******************************************************************************/
 class ReadCookieDBListener MOZ_FINAL : public DBListenerErrorHandler
 {
-protected:
+private:
   virtual const char *GetOpType() { return "READ"; }
   bool mCanceled;
 
+  ~ReadCookieDBListener() {}
+
 public:
   NS_DECL_ISUPPORTS
 
@@ -555,6 +563,8 @@ NS_IMPL_ISUPPORTS(ReadCookieDBListener, mozIStorageStatementCallback)
  ******************************************************************************/
 class CloseCookieDBListener MOZ_FINAL :  public mozIStorageCompletionCallback
 {
+  ~CloseCookieDBListener() {}
+
 public:
   CloseCookieDBListener(DBState* dbState) : mDBState(dbState) { }
   nsRefPtr<DBState> mDBState;
@@ -572,6 +582,9 @@ NS_IMPL_ISUPPORTS(CloseCookieDBListener, mozIStorageCompletionCallback)
 namespace {
 
 class AppClearDataObserver MOZ_FINAL : public nsIObserver {
+
+  ~AppClearDataObserver() {}
+
 public:
   NS_DECL_ISUPPORTS
 

netwerk/cookie/nsCookieService.h

@@ -256,7 +256,6 @@ class nsCookieService : public nsICookieService
     NS_DECL_NSIMEMORYREPORTER
 
     nsCookieService();
-    virtual ~nsCookieService();
     static nsICookieService*      GetXPCOMSingleton();
     nsresult                      Init();
 
@@ -269,6 +268,8 @@ class nsCookieService : public nsICookieService
   static void AppClearDataObserverInit();
 
   protected:
+    virtual ~nsCookieService();
+
     void                          PrefChanged(nsIPrefBranch *aPrefBranch);
     void                          InitDBStates();
     OpenDBResult                  TryInitDB(bool aDeleteExistingDB);

netwerk/dns/ChildDNSService.h

@@ -27,11 +27,12 @@ public:
   NS_DECL_NSIOBSERVER
 
   ChildDNSService();
-  virtual ~ChildDNSService();
 
   static ChildDNSService* GetSingleton();
 
 private:
+  virtual ~ChildDNSService();
+
   bool mFirstTime;
   bool mOffline;
   bool mDisablePrefetch;

netwerk/dns/DNSListenerProxy.h

@@ -56,6 +56,8 @@ public:
   };
 
 private:
+  ~DNSListenerProxy() {}
+
   nsMainThreadPtrHandle<nsIDNSListener> mListener;
   nsCOMPtr<nsIEventTarget> mTargetThread;
 };

netwerk/dns/DNSRequestChild.cpp

@@ -30,9 +30,10 @@ public:
   NS_DECL_NSIDNSRECORD
 
   ChildDNSRecord(const DNSRecord& reply, uint16_t flags);
-  virtual ~ChildDNSRecord();
 
 private:
+  virtual ~ChildDNSRecord();
+
   nsCString mCanonicalName;
   nsTArray<NetAddr> mAddresses;
   uint32_t mCurrent; // addr iterator

netwerk/dns/DNSRequestChild.h

@@ -26,7 +26,6 @@ public:
 
   DNSRequestChild(const nsCString& aHost, const uint32_t& aFlags,
                   nsIDNSListener *aListener, nsIEventTarget *target);
-  virtual ~DNSRequestChild() {}
 
   void AddIPDLReference() {
     AddRef();
@@ -43,6 +42,8 @@ public:
   void CallOnLookupComplete();
 
 private:
+  virtual ~DNSRequestChild() {}
+
   virtual bool Recv__delete__(const DNSRequestResponse& reply) MOZ_OVERRIDE;
 
   nsCOMPtr<nsIDNSListener>  mListener;

netwerk/dns/DNSRequestParent.h

@@ -23,13 +23,14 @@ public:
   NS_DECL_NSIDNSLISTENER
 
   DNSRequestParent();
-  virtual ~DNSRequestParent();
 
   void DoAsyncResolve(const nsACString  &hostname, uint32_t flags);
 
 protected:
   virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
 private:
+  virtual ~DNSRequestParent();
+
   uint32_t mFlags;
   bool mIPCClosed;  // true if IPDL channel has been closed (child crash)
 };

netwerk/dns/nsDNSService2.cpp

@@ -250,6 +250,8 @@ nsDNSRecord::ReportUnusable(uint16_t aPort)
 class nsDNSAsyncRequest MOZ_FINAL : public nsResolveHostCallback
                                   , public nsICancelable
 {
+    ~nsDNSAsyncRequest() {}
+
 public:
     NS_DECL_THREADSAFE_ISUPPORTS
     NS_DECL_NSICANCELABLE
@@ -264,7 +266,6 @@ public:
         , mListener(listener)
         , mFlags(flags)
         , mAF(af) {}
-    ~nsDNSAsyncRequest() {}
 
     void OnLookupComplete(nsHostResolver *, nsHostRecord *, nsresult);
     // Returns TRUE if the DNS listener arg is the same as the member listener

netwerk/dns/nsDNSService2.h

@@ -33,13 +33,14 @@ public:
     NS_DECL_NSIMEMORYREPORTER
 
     nsDNSService();
-    ~nsDNSService();
 
     static nsIDNSService* GetXPCOMSingleton();
 
     size_t SizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf) const;
 
 private:
+    ~nsDNSService();
+
     static nsDNSService* GetSingleton();
 
     uint16_t GetAFForLookup(const nsACString &host, uint32_t flags);

netwerk/dns/nsIDNService.h

@@ -32,10 +32,12 @@ public:
   NS_DECL_NSIOBSERVER
 
   nsIDNService();
-  virtual ~nsIDNService();
 
   nsresult Init();
 
+protected:
+  virtual ~nsIDNService();
+
 private:
   void normalizeFullStops(nsAString& s);
   nsresult stringPrepAndACE(const nsAString& in, nsACString& out,

netwerk/ipc/NeckoParent.h

@@ -70,6 +70,8 @@ public:
    */
   class NestedFrameAuthPrompt MOZ_FINAL : public nsIAuthPrompt2
   {
+    ~NestedFrameAuthPrompt() {}
+
   public:
     NS_DECL_ISUPPORTS
 

netwerk/ipc/RemoteOpenFileChild.h

@@ -52,6 +52,8 @@ class RemoteOpenFileChild MOZ_FINAL
   typedef mozilla::dom::TabChild TabChild;
   typedef mozilla::ipc::FileDescriptor FileDescriptor;
 
+  virtual ~RemoteOpenFileChild();
+
 public:
   RemoteOpenFileChild()
     : mNSPRFileDesc(nullptr)
@@ -59,8 +61,6 @@ public:
     , mNSPROpenCalled(false)
   {}
 
-  virtual ~RemoteOpenFileChild();
-
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIFILE
   NS_DECL_NSIHASHABLE

netwerk/mime/nsMIMEHeaderParamImpl.h

@@ -14,8 +14,8 @@ public:
   NS_DECL_NSIMIMEHEADERPARAM
 
   nsMIMEHeaderParamImpl() {}
-  virtual ~nsMIMEHeaderParamImpl() {}
 private:
+  virtual ~nsMIMEHeaderParamImpl() {}
   enum ParamDecoding {
     MIME_FIELD_ENCODING = 1,
     HTTP_FIELD_ENCODING

netwerk/protocol/about/nsAboutBlank.h

@@ -16,12 +16,12 @@ public:
     NS_DECL_NSIABOUTMODULE
 
     nsAboutBlank() {}
-    virtual ~nsAboutBlank() {}
 
     static nsresult
     Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
 
-protected:
+private:
+    virtual ~nsAboutBlank() {}
 };
 
 #define NS_ABOUT_BLANK_MODULE_CID                    \

netwerk/protocol/about/nsAboutBloat.h

@@ -16,12 +16,12 @@ public:
     NS_DECL_NSIABOUTMODULE
 
     nsAboutBloat() {}
-    virtual ~nsAboutBloat() {}
 
     static nsresult
     Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
 
-protected:
+private:
+    virtual ~nsAboutBloat() {}
 };
 
 #define NS_ABOUT_BLOAT_MODULE_CID                    \

netwerk/protocol/about/nsAboutCache.h

@@ -26,7 +26,6 @@ public:
     NS_DECL_NSICACHESTORAGEVISITOR
 
     nsAboutCache() {}
-    virtual ~nsAboutCache() {}
 
     static nsresult
     Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
@@ -36,6 +35,8 @@ public:
                nsICacheStorage **storage);
 
 protected:
+    virtual ~nsAboutCache() {}
+
     nsresult ParseURI(nsIURI * uri, nsACString & storage);
 
     // Finds a next storage we wish to visit (we use this method

netwerk/protocol/about/nsAboutCacheEntry.h

@@ -38,9 +38,9 @@ public:
         , mHexDumpState(0)
     {}
 
+private:
     virtual ~nsAboutCacheEntry() {}
 
-private:
     nsresult GetContentStream(nsIURI *, nsIInputStream **);
     nsresult OpenCacheEntry(nsIURI *);
     nsresult OpenCacheEntry();

netwerk/protocol/about/nsAboutProtocolHandler.h

@@ -22,6 +22,8 @@ public:
 
     // nsAboutProtocolHandler methods:
     nsAboutProtocolHandler() {}
+
+private:
     virtual ~nsAboutProtocolHandler() {}
 };
 

netwerk/protocol/app/AppProtocolHandler.cpp

@@ -31,6 +31,8 @@ public:
   NS_IMETHODIMP Run();
 
 private:
+  ~DummyChannel() {}
+
   bool                        mPending;
   uint32_t                    mSuspendCount;
   nsCOMPtr<nsISupports>       mListenerContext;

netwerk/protocol/app/AppProtocolHandler.h

@@ -21,7 +21,6 @@ public:
 
   // AppProtocolHandler methods:
   AppProtocolHandler();
-  virtual ~AppProtocolHandler();
 
   // Define a Create method to be used with a factory:
   static nsresult Create(nsISupports* aOuter,
@@ -29,6 +28,7 @@ public:
                          void* *aResult);
 
 private:
+  virtual ~AppProtocolHandler();
   nsClassHashtable<nsCStringHashKey, mozilla::dom::AppInfo> mAppInfoCache;
 };
 

netwerk/protocol/data/nsDataHandler.h

@@ -10,6 +10,8 @@
 
 class nsDataHandler : public nsIProtocolHandler
 {
+    virtual ~nsDataHandler();
+
 public:
     NS_DECL_ISUPPORTS
 
@@ -18,7 +20,6 @@ public:
 
     // nsDataHandler methods:
     nsDataHandler();
-    virtual ~nsDataHandler();
 
     // Define a Create method to be used with a factory:
     static nsresult

netwerk/protocol/device/nsDeviceProtocolHandler.h

@@ -15,12 +15,13 @@
     {0xae, 0xb7, 0xda, 0x62, 0xe7, 0x27, 0x3e, 0xd5} }
 
 class nsDeviceProtocolHandler MOZ_FINAL : public nsIProtocolHandler {
+  ~nsDeviceProtocolHandler() {}
+
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIPROTOCOLHANDLER
 
   nsDeviceProtocolHandler() {}
-  ~nsDeviceProtocolHandler() {}
 
   nsresult Init();
 };

netwerk/protocol/file/nsFileProtocolHandler.h

@@ -12,13 +12,14 @@
 class nsFileProtocolHandler : public nsIFileProtocolHandler
                             , public nsSupportsWeakReference
 {
+    virtual ~nsFileProtocolHandler() {}
+
 public:
     NS_DECL_THREADSAFE_ISUPPORTS
     NS_DECL_NSIPROTOCOLHANDLER
     NS_DECL_NSIFILEPROTOCOLHANDLER
 
     nsFileProtocolHandler();
-    virtual ~nsFileProtocolHandler() {}
 
     nsresult Init();
 };

netwerk/protocol/ftp/FTPChannelParent.h

@@ -33,7 +33,6 @@ public:
   NS_DECL_NSIINTERFACEREQUESTOR
 
   FTPChannelParent(nsILoadContext* aLoadContext, PBOverrideStatus aOverrideStatus);
-  virtual ~FTPChannelParent();
 
   bool Init(const FTPChannelCreationArgs& aOpenArgs);
 
@@ -51,6 +50,8 @@ public:
   void NotifyDiversionFailed(nsresult aErrorCode, bool aSkipResume = true);
 
 protected:
+  virtual ~FTPChannelParent();
+
   // private, supporting function for ADivertableParentChannel.
   nsresult ResumeForDiversion();
 

netwerk/protocol/ftp/nsFTPChannel.cpp

@@ -132,6 +132,8 @@ namespace {
 
 class FTPEventSinkProxy MOZ_FINAL : public nsIFTPEventSink
 {
+    ~FTPEventSinkProxy() {}
+
 public:
     FTPEventSinkProxy(nsIFTPEventSink* aTarget)
         : mTarget(aTarget)

netwerk/protocol/ftp/nsFtpControlConnection.h

@@ -40,12 +40,13 @@ public:
 
 class nsFtpControlConnection MOZ_FINAL : public nsIInputStreamCallback
 {
+    ~nsFtpControlConnection();
+
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSIINPUTSTREAMCALLBACK
 
     nsFtpControlConnection(const nsCSubstring& host, uint32_t port);
-    ~nsFtpControlConnection();
 
     nsresult Connect(nsIProxyInfo* proxyInfo, nsITransportEventSink* eventSink);
     nsresult Disconnect(nsresult status);

netwerk/protocol/ftp/nsFtpProtocolHandler.h

@@ -28,7 +28,6 @@ public:
     NS_DECL_NSIOBSERVER
     
     nsFtpProtocolHandler();
-    virtual ~nsFtpProtocolHandler();
     
     nsresult Init();
 
@@ -41,6 +40,8 @@ public:
     uint8_t GetControlQoSBits() { return mControlQoSBits; }
 
 private:
+    virtual ~nsFtpProtocolHandler();
+
     // Stuff for the timer callback function
     struct timerStruct {
         nsCOMPtr<nsITimer>      timer;

netwerk/protocol/http/Http2Push.h

@@ -75,12 +75,13 @@ public:
   NS_DECL_NSAHTTPTRANSACTION
 
   Http2PushTransactionBuffer();
-  virtual ~Http2PushTransactionBuffer();
 
   nsresult GetBufferedData(char *buf, uint32_t count, uint32_t *countWritten);
   void SetPushStream(Http2PushedStream *stream) { mPushStream = stream; }
 
 private:
+  virtual ~Http2PushTransactionBuffer();
+
   const static uint32_t kDefaultBufferSize = 4096;
 
   nsresult mStatus;

netwerk/protocol/http/Http2Session.h

@@ -32,6 +32,8 @@ class Http2Session MOZ_FINAL : public ASpdySession
   , public nsAHttpSegmentReader
   , public nsAHttpSegmentWriter
 {
+  ~Http2Session();
+
 public:
   NS_DECL_ISUPPORTS
     NS_DECL_NSAHTTPTRANSACTION
@@ -39,8 +41,7 @@ public:
     NS_DECL_NSAHTTPSEGMENTREADER
     NS_DECL_NSAHTTPSEGMENTWRITER
 
-   Http2Session(nsISocketTransport *);
-  ~Http2Session();
+  Http2Session(nsISocketTransport *);
 
   bool AddStream(nsAHttpTransaction *, int32_t,
                  bool, nsIInterfaceRequestor *);

netwerk/protocol/http/HttpBaseChannel.h

@@ -63,6 +63,9 @@ class HttpBaseChannel : public nsHashPropertyBag
                       , public PrivateBrowsingChannel<HttpBaseChannel>
                       , public nsITimedChannel
 {
+protected:
+  virtual ~HttpBaseChannel();
+
 public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIUPLOADCHANNEL
@@ -72,7 +75,6 @@ public:
   NS_DECL_NSIREDIRECTHISTORY
 
   HttpBaseChannel();
-  virtual ~HttpBaseChannel();
 
   virtual nsresult Init(nsIURI *aURI, uint32_t aCaps, nsProxyInfo *aProxyInfo,
                         uint32_t aProxyResolveFlags,
@@ -189,9 +191,10 @@ public:
         NS_DECL_NSIUTF8STRINGENUMERATOR
 
         nsContentEncodings(nsIHttpChannel* aChannel, const char* aEncodingHeader);
-        virtual ~nsContentEncodings();
 
     private:
+        virtual ~nsContentEncodings();
+
         nsresult PrepareForNext(void);
 
         // We do not own the buffer.  The channel owns it.

netwerk/protocol/http/HttpChannelChild.h

@@ -49,6 +49,7 @@ class HttpChannelChild : public PHttpChannelChild
                        , public nsIHttpChannelChild
                        , public nsIDivertableChannel
 {
+  virtual ~HttpChannelChild();
 public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSICACHEINFOCHANNEL
@@ -62,7 +63,6 @@ public:
   NS_DECL_NSIDIVERTABLECHANNEL
 
   HttpChannelChild();
-  virtual ~HttpChannelChild();
 
   // Methods HttpBaseChannel didn't implement for us or that we override.
   //

netwerk/protocol/http/HttpChannelParent.h

@@ -39,6 +39,8 @@ class HttpChannelParent : public PHttpChannelParent
                         , public ADivertableParentChannel
                         , public nsIAuthPromptProvider
 {
+  virtual ~HttpChannelParent();
+
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIREQUESTOBSERVER
@@ -52,7 +54,6 @@ public:
   HttpChannelParent(const PBrowserOrId& iframeEmbedding,
                     nsILoadContext* aLoadContext,
                     PBOverrideStatus aStatus);
-  virtual ~HttpChannelParent();
 
   bool Init(const HttpChannelCreationArgs& aOpenArgs);
 

netwerk/protocol/http/HttpChannelParentListener.h

@@ -33,13 +33,14 @@ public:
   NS_DECL_NSISTREAMLISTENER
 
   HttpChannelParentListener(HttpChannelParent* aInitialChannel);
-  virtual ~HttpChannelParentListener();
 
   // For channel diversion from child to parent.
   nsresult DivertTo(nsIStreamListener *aListener);
   nsresult SuspendForDiversion();
 
 private:
+  virtual ~HttpChannelParentListener();
+
   // Private partner function to SuspendForDiversion.
   nsresult ResumeForDiversion();
 

netwerk/protocol/http/NullHttpTransaction.h

@@ -35,7 +35,6 @@ public:
   NullHttpTransaction(nsHttpConnectionInfo *ci,
                       nsIInterfaceRequestor *callbacks,
                       uint32_t caps);
-  virtual ~NullHttpTransaction();
 
   // Overload of nsAHttpTransaction methods
   bool IsNullTransaction() MOZ_OVERRIDE MOZ_FINAL { return true; }
@@ -45,8 +44,10 @@ public:
     return PR_SecondsToInterval(15);
   }
 
-private:
+protected:
+  virtual ~NullHttpTransaction();
 
+private:
   nsresult mStatus;
   uint32_t mCaps;
   // mCapsToClear holds flags that should be cleared in mCaps, e.g. unset

netwerk/protocol/http/SpdyPush3.h

@@ -76,12 +76,13 @@ public:
   NS_DECL_NSAHTTPTRANSACTION
 
   SpdyPush3TransactionBuffer();
-  virtual ~SpdyPush3TransactionBuffer();
 
   nsresult GetBufferedData(char *buf, uint32_t count, uint32_t *countWritten);
   void SetPushStream(SpdyPushedStream3 *stream) { mPushStream = stream; }
 
 private:
+  virtual ~SpdyPush3TransactionBuffer();
+
   const static uint32_t kDefaultBufferSize = 4096;
 
   nsresult mStatus;