Bug 1137151: Marked destructors of ref-counted GonkHAL classes as protected, r=dhylands

hal/gonk/GonkHal.cpp

@@ -297,6 +297,9 @@ public:
 
   static bool ShuttingDown() { return sShuttingDown; }
 
+protected:
+  ~VibratorRunnable() {}
+
 private:
   Monitor mMonitor;
 
@@ -471,7 +474,7 @@ public:
 
 } // anonymous namespace
 
-class BatteryObserver : public IUeventObserver
+class BatteryObserver MOZ_FINAL : public IUeventObserver
 {
 public:
   NS_INLINE_DECL_REFCOUNTING(BatteryObserver)
@@ -495,6 +498,9 @@ public:
     }
   }
 
+protected:
+  ~BatteryObserver() {}
+
 private:
   nsRefPtr<BatteryUpdater> mUpdater;
 };
@@ -1172,6 +1178,10 @@ public:
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSIOBSERVER
+
+protected:
+  ~OomVictimLogger() {}
+
 private:
   double mLastLineChecked;
   ScopedFreePtr<regex_t> mRegexes;

hal/gonk/GonkSwitch.cpp

@@ -61,10 +61,6 @@ public:
     GetInitialState();
   }
 
-  virtual ~SwitchHandler()
-  {
-  }
-
   bool CheckEvent(NetlinkEvent* aEvent)
   {
     if (strcmp(GetSubsystem(), aEvent->getSubsystem()) ||
@@ -86,6 +82,10 @@ public:
     return mDevice;
   }
 protected:
+  virtual ~SwitchHandler()
+  {
+  }
+
   virtual const char* GetSubsystem()
   {
     return "switch";