Bug 1028148, part 1 - Make SharedMemory's dtor private. r=bent

ipc/glue/SharedMemory.h

@@ -30,17 +30,11 @@ namespace ipc {
 class SharedMemory;
 }
 
-template<>
-struct HasDangerousPublicDestructor<mozilla::ipc::SharedMemory>
-{
-  static const bool value = true;
-};
-
 namespace ipc {
 
 class SharedMemory
 {
-public:
+protected:
   virtual ~SharedMemory()
   {
     MOZ_COUNT_DTOR(SharedMemory);
@@ -48,6 +42,7 @@ public:
     Destroyed();
   }
 
+public:
   enum SharedMemoryType {
     TYPE_BASIC,
     TYPE_SYSV,

ipc/glue/SharedMemoryBasic_android.h

@@ -20,7 +20,7 @@
 namespace mozilla {
 namespace ipc {
 
-class SharedMemoryBasic : public SharedMemory
+class SharedMemoryBasic MOZ_FINAL : public SharedMemory
 {
 public:
   typedef base::FileDescriptor Handle;
@@ -29,8 +29,6 @@ public:
 
   SharedMemoryBasic(const Handle& aHandle);
 
-  virtual ~SharedMemoryBasic();
-
   virtual bool Create(size_t aNbytes) MOZ_OVERRIDE;
 
   virtual bool Map(size_t nBytes) MOZ_OVERRIDE;
@@ -59,6 +57,8 @@ public:
                       Handle* aNewHandle);
 
 private:
+  ~SharedMemoryBasic();
+
   void Unmap();
   void Destroy();
 

ipc/glue/SharedMemoryBasic_chromium.h

@@ -84,6 +84,10 @@ public:
   }
 
 private:
+  ~SharedMemoryBasic()
+  {
+  }
+
   base::SharedMemory mSharedMemory;
 };