diff -r 000000000000 -r 6474c204b198 ipc/ipdl/test/cxx/TestStackHooks.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ipc/ipdl/test/cxx/TestStackHooks.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,168 @@
+#include "TestStackHooks.h"
+
+#include "IPDLUnitTests.h"      // fail etc.
+
+
+
+namespace mozilla {
+namespace _ipdltest {
+
+//-----------------------------------------------------------------------------
+// parent
+
+TestStackHooksParent::TestStackHooksParent() :
+    mOnStack(false), mIncallDepth(0)
+{
+    MOZ_COUNT_CTOR(TestStackHooksParent);
+}
+
+TestStackHooksParent::~TestStackHooksParent()
+{
+    MOZ_COUNT_DTOR(TestStackHooksParent);
+}
+
+void
+TestStackHooksParent::Main()
+{
+    if (!SendStart())
+        fail("sending Start()");
+}
+
+
+bool
+TestStackHooksParent::AnswerStackFrame()
+{
+    if (!mOnStack)
+        fail("not on C++ stack?!");
+
+    if (!CallStackFrame())
+        fail("calling StackFrame()");
+
+    if (!mOnStack)
+        fail("not on C++ stack?!");
+
+    if (1 != mIncallDepth)
+        fail("missed EnteredCall or ExitedCall hook");
+
+    return true;
+}
+
+//-----------------------------------------------------------------------------
+// child
+
+TestStackHooksChild::TestStackHooksChild() :
+    mOnStack(false),
+    mEntered(0),
+    mExited(0),
+    mIncallDepth(0)
+{
+    MOZ_COUNT_CTOR(TestStackHooksChild);
+}
+
+TestStackHooksChild::~TestStackHooksChild()
+{
+    MOZ_COUNT_DTOR(TestStackHooksChild);
+}
+
+namespace {
+void RunTestsFn() {
+    static_cast<TestStackHooksChild*>(gChildActor)->RunTests();
+}
+}
+
+bool
+TestStackHooksChild::RecvStart()
+{
+    if (!mOnStack)
+        fail("missed stack notification");
+
+    if (0 != mIncallDepth)
+        fail("EnteredCall/ExitedCall malfunction");
+
+    // kick off tests from a runnable so that we can start with
+    // MessageChannel code on the C++ stack
+    MessageLoop::current()->PostTask(FROM_HERE,
+                                     NewRunnableFunction(RunTestsFn));
+
+    return true;
+}
+
+bool
+TestStackHooksChild::AnswerStackFrame()
+{
+    if (!mOnStack)
+        fail("missed stack notification");
+
+    if (1 != mIncallDepth)
+        fail("missed EnteredCall or ExitedCall hook");
+
+    if (PTestStackHooks::TEST4_3 == state()) {
+        if (!SendAsync())
+            fail("sending Async()");
+    }
+    else if (PTestStackHooks::TEST5_3 == state()) {
+        if (!SendSync())
+            fail("sending Sync()");
+    }
+    else {
+        fail("unexpected state");
+    }
+
+    if (!mOnStack)
+        fail("bad stack exit notification");
+
+    return true;
+}
+
+void
+TestStackHooksChild::RunTests()
+{
+    // 1 because of RecvStart()
+    if (1 != mEntered)
+        fail("missed stack notification");
+    if (mOnStack)
+        fail("spurious stack notification");
+    if (0 != mIncallDepth)
+        fail("EnteredCall/ExitedCall malfunction");
+
+    if (!SendAsync())
+        fail("sending Async()");
+    if (mOnStack)
+        fail("spurious stack notification");
+    if (0 != mIncallDepth)
+        fail("EnteredCall/ExitedCall malfunction");
+    if (2 != mEntered)
+        fail("missed stack notification");
+
+    if (!SendSync())
+        fail("sending Sync()");
+    if (mOnStack)
+        fail("spurious stack notification");
+    if (0 != mIncallDepth)
+        fail("EnteredCall/ExitedCall malfunction");
+    if (3 != mEntered)
+        fail("missed stack notification");
+
+    if (!CallRpc())
+        fail("calling RPC()");
+    if (mOnStack)
+        fail("spurious stack notification");
+    if (0 != mIncallDepth)
+        fail("EnteredCall/ExitedCall malfunction");
+    if (4 != mEntered)
+        fail("missed stack notification");
+
+    if (!CallStackFrame())
+        fail("calling StackFrame()");
+    if (mOnStack)
+        fail("spurious stack notification");
+    if (0 != mIncallDepth)
+        fail("EnteredCall/ExitedCall malfunction");
+    if (5 != mEntered)
+        fail("missed stack notification");
+
+    Close();
+}
+
+} // namespace _ipdltest
+} // namespace mozilla