Bug 1036877: add private dtor for Reference-counted RIL components. r=hsinyi

dom/cellbroadcast/src/CellBroadcast.cpp

@@ -37,6 +37,12 @@ public:
     MOZ_ASSERT(mCellBroadcast);
     mCellBroadcast = nullptr;
   }
+
+private:
+  ~Listener()
+  {
+    MOZ_ASSERT(!mCellBroadcast);
+  }
 };
 
 NS_IMPL_ISUPPORTS(CellBroadcast::Listener, nsICellBroadcastListener)

dom/icc/src/IccListener.h

@@ -21,7 +21,6 @@ public:
   NS_DECL_NSIICCLISTENER
 
   IccListener(IccManager* aIccManager, uint32_t aClientId);
-  ~IccListener();
 
   void
   Shutdown();
@@ -32,6 +31,9 @@ public:
     return mIcc;
   }
 
+private:
+  ~IccListener();
+
 private:
   uint32_t mClientId;
   // We did not setup 'mIcc' and 'mIccManager' being a participant of cycle

dom/icc/src/IccManager.h

@@ -26,7 +26,6 @@ public:
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(IccManager, DOMEventTargetHelper)
 
   IccManager(nsPIDOMWindow* aWindow);
-  ~IccManager();
 
   void
   Shutdown();
@@ -52,6 +51,9 @@ public:
   virtual JSObject*
   WrapObject(JSContext* aCx) MOZ_OVERRIDE;
 
+private:
+  ~IccManager();
+
 private:
   nsTArray<nsRefPtr<IccListener>> mIccListeners;
 };

dom/mobileconnection/src/DOMMMIError.h

@@ -43,6 +43,9 @@ public:
     return mInfo;
   }
 
+private:
+  ~DOMMMIError() {}
+
 private:
   nsString mServiceCode;
   Nullable<int16_t> mInfo;

dom/mobileconnection/src/MobileCellInfo.h

@@ -78,6 +78,9 @@ public:
     return mCdmaNetworkId;
   }
 
+private:
+  ~MobileCellInfo() {}
+
 private:
   nsCOMPtr<nsPIDOMWindow> mWindow;
   int32_t mGsmLocationAreaCode;

dom/mobileconnection/src/MobileConnection.cpp

@@ -62,6 +62,12 @@ public:
     MOZ_ASSERT(mMobileConnection);
     mMobileConnection = nullptr;
   }
+
+private:
+  ~Listener()
+  {
+    MOZ_ASSERT(!mMobileConnection);
+  }
 };
 
 NS_IMPL_ISUPPORTS(MobileConnection::Listener, nsIMobileConnectionListener)
@@ -130,6 +136,11 @@ MobileConnection::Shutdown()
   }
 }
 
+MobileConnection::~MobileConnection()
+{
+  MOZ_ASSERT(!(mProvider || mListener || mVoice || mData));
+}
+
 JSObject*
 MobileConnection::WrapObject(JSContext* aCx)
 {

dom/mobileconnection/src/MobileConnection.h

@@ -155,6 +155,9 @@ public:
   IMPL_EVENT_HANDLER(radiostatechange)
   IMPL_EVENT_HANDLER(clirmodechange)
 
+private:
+  ~MobileConnection();
+
 private:
   uint32_t mClientId;
   nsCOMPtr<nsIMobileConnectionProvider> mProvider;

dom/mobileconnection/src/MobileConnectionInfo.h

@@ -93,6 +93,9 @@ public:
     return mCellInfo;
   }
 
+private:
+  ~MobileConnectionInfo() {}
+
 private:
   bool mConnected;
   bool mEmergencyCallsOnly;

dom/mobileconnection/src/MobileNetworkInfo.h

@@ -61,6 +61,9 @@ public:
     return Nullable<MobileNetworkState>();
   }
 
+private:
+  ~MobileNetworkInfo() {}
+
 private:
   nsCOMPtr<nsPIDOMWindow> mWindow;
   nsString mShortName;

dom/voicemail/Voicemail.cpp

@@ -39,6 +39,12 @@ public:
     MOZ_ASSERT(mVoicemail);
     mVoicemail = nullptr;
   }
+
+private:
+  ~Listener()
+  {
+    MOZ_ASSERT(!mVoicemail);
+  }
 };
 
 NS_IMPL_ISUPPORTS(Voicemail::Listener, nsIVoicemailListener)