Bug 1006128 - Fix IPDL unit tests after bug 960774, r=bsmedberg.
authorBen Turner <bent.mozilla@gmail.com>
Thu, 08 May 2014 14:49:41 -0700
changeset 182254 f00143b58e26fe885078bb3fa3add21ab6f23687
parent 182253 9683c0651dc3e1855f2382237fbe33cf60f175b5
child 182255 eb6f489e2344b77440e7e209b0ecb03bae7971de
push id26754
push userkwierso@gmail.com
push dateFri, 09 May 2014 02:06:18 +0000
treeherdermozilla-central@cf89b5d018f8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs1006128, 960774
milestone32.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1006128 - Fix IPDL unit tests after bug 960774, r=bsmedberg.
ipc/ipdl/test/cxx/TestActorPunning.h
ipc/ipdl/test/cxx/TestBadActor.h
ipc/ipdl/test/cxx/TestDesc.h
ipc/ipdl/test/cxx/TestJSON.h
ipc/ipdl/test/cxx/TestManyChildAllocs.h
ipc/ipdl/test/cxx/TestMultiMgrs.h
--- a/ipc/ipdl/test/cxx/TestActorPunning.h
+++ b/ipc/ipdl/test/cxx/TestActorPunning.h
@@ -42,24 +42,28 @@ protected:
 };
 
 class TestActorPunningPunnedParent :
     public PTestActorPunningPunnedParent
 {
 public:
     TestActorPunningPunnedParent() {}
     virtual ~TestActorPunningPunnedParent() {}
+protected:
+    virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE {}
 };
 
 class TestActorPunningSubParent :
     public PTestActorPunningSubParent
 {
 public:
     TestActorPunningSubParent() {}
     virtual ~TestActorPunningSubParent() {}
+protected:
+    virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE {}
 };
 
 
 class TestActorPunningChild :
     public PTestActorPunningChild
 {
 public:
     TestActorPunningChild() {}
--- a/ipc/ipdl/test/cxx/TestBadActor.h
+++ b/ipc/ipdl/test/cxx/TestBadActor.h
@@ -46,16 +46,17 @@ protected:
 class TestBadActorSubParent
   : public PTestBadActorSubParent
 {
 public:
   TestBadActorSubParent() { }
   virtual ~TestBadActorSubParent() { }
 
 protected:
+  virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE {}
   virtual bool RecvPing();
 };
 
 class TestBadActorChild
   : public PTestBadActorChild
 {
 public:
   TestBadActorChild() { }
--- a/ipc/ipdl/test/cxx/TestDesc.h
+++ b/ipc/ipdl/test/cxx/TestDesc.h
@@ -75,18 +75,18 @@ protected:
 class TestDescSubParent :
     public PTestDescSubParent
 {
 public:
     TestDescSubParent() { }
     virtual ~TestDescSubParent() { }
 
 protected:
+    virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE {}
     virtual PTestDescSubsubParent* AllocPTestDescSubsubParent() MOZ_OVERRIDE;
-
     virtual bool DeallocPTestDescSubsubParent(PTestDescSubsubParent* actor) MOZ_OVERRIDE;
 };
 
 
 class TestDescSubChild :
     public PTestDescSubChild
 {
 public:
@@ -103,16 +103,19 @@ protected:
 // Grand-descendent
 //
 class TestDescSubsubParent :
     public PTestDescSubsubParent
 {
 public:
     TestDescSubsubParent() { }
     virtual ~TestDescSubsubParent() { }
+
+protected:
+    virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE {}
 };
 
 class TestDescSubsubChild :
     public PTestDescSubsubChild
 {
 public:
     TestDescSubsubChild() { }
     virtual ~TestDescSubsubChild() { }
--- a/ipc/ipdl/test/cxx/TestJSON.h
+++ b/ipc/ipdl/test/cxx/TestJSON.h
@@ -13,16 +13,19 @@ namespace mozilla {
 namespace _ipdltest {
 
 class TestHandleParent :
     public PTestHandleParent
 {
 public:
     TestHandleParent() { }
     virtual ~TestHandleParent() { }
+
+protected:
+    virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE {}
 };
 
 class TestJSONParent :
     public PTestJSONParent
 {
 public:
     TestJSONParent() { }
     virtual ~TestJSONParent() { }
--- a/ipc/ipdl/test/cxx/TestManyChildAllocs.h
+++ b/ipc/ipdl/test/cxx/TestManyChildAllocs.h
@@ -67,16 +67,17 @@ protected:
 class TestManyChildAllocsSubParent :
     public PTestManyChildAllocsSubParent
 {
 public:
     TestManyChildAllocsSubParent() { }
     virtual ~TestManyChildAllocsSubParent() { }
 
 protected:
+    virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE {}
     virtual bool RecvHello() MOZ_OVERRIDE { return true; }
 };
 
 
 class TestManyChildAllocsSubChild :
     public PTestManyChildAllocsSubChild
 {
 public:
--- a/ipc/ipdl/test/cxx/TestMultiMgrs.h
+++ b/ipc/ipdl/test/cxx/TestMultiMgrs.h
@@ -20,31 +20,36 @@ namespace _ipdltest {
 //
 
 class TestMultiMgrsBottomParent :
     public PTestMultiMgrsBottomParent
 {
 public:
     TestMultiMgrsBottomParent() { }
     virtual ~TestMultiMgrsBottomParent() { }
+
+protected:
+    virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE {}
 };
 
 class TestMultiMgrsLeftParent :
     public PTestMultiMgrsLeftParent
 {
 public:
     TestMultiMgrsLeftParent() { }
     virtual ~TestMultiMgrsLeftParent() { }
 
     bool HasChild(TestMultiMgrsBottomParent* c)
     {
         return ManagedPTestMultiMgrsBottomParent().Contains(c);
     }
 
 protected:
+    virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE {}
+
     virtual PTestMultiMgrsBottomParent* AllocPTestMultiMgrsBottomParent() MOZ_OVERRIDE
     {
         return new TestMultiMgrsBottomParent();
     }
 
     virtual bool DeallocPTestMultiMgrsBottomParent(PTestMultiMgrsBottomParent* actor) MOZ_OVERRIDE
     {
         delete actor;
@@ -60,16 +65,18 @@ public:
     virtual ~TestMultiMgrsRightParent() { }
 
     bool HasChild(TestMultiMgrsBottomParent* c)
     {
         return ManagedPTestMultiMgrsBottomParent().Contains(c);
     }
 
 protected:
+    virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE {}
+
     virtual PTestMultiMgrsBottomParent* AllocPTestMultiMgrsBottomParent() MOZ_OVERRIDE
     {
         return new TestMultiMgrsBottomParent();
     }
 
     virtual bool DeallocPTestMultiMgrsBottomParent(PTestMultiMgrsBottomParent* actor) MOZ_OVERRIDE
     {
         delete actor;