diff --git a/mobile/android/tests/browser/robocop/testEventDispatcher.java b/mobile/android/tests/browser/robocop/testEventDispatcher.java
index e19f175d360..60226c5ebc7 100644
--- a/mobile/android/tests/browser/robocop/testEventDispatcher.java
+++ b/mobile/android/tests/browser/robocop/testEventDispatcher.java
@@ -36,6 +36,7 @@ public class testEventDispatcher extends UITest
     private static final String NATIVE_EXCEPTION_EVENT = "Robocop:TestNativeException";
 
     private JavascriptBridge js;
+    private NativeJSObject savedMessage;
 
     @Override
     public void setUp() throws Exception {
@@ -72,6 +73,14 @@ public class testEventDispatcher extends UITest
         js.syncCall("send_message_for_response", NATIVE_RESPONSE_EVENT, "success");
         js.syncCall("send_message_for_response", NATIVE_RESPONSE_EVENT, "error");
         js.syncCall("send_test_message", NATIVE_EXCEPTION_EVENT);
+
+        fAssertNotSame("Should have saved a message", null, savedMessage);
+        try {
+            savedMessage.toString();
+            fFail("Using NativeJSContainer should throw after disposal");
+        } catch (final NullPointerException e) {
+        }
+
         js.syncCall("finish_test");
     }
 
@@ -175,6 +184,9 @@ public class testEventDispatcher extends UITest
             } catch (final NativeJSObject.InvalidPropertyException e) {
             }
 
+            // Save this message for post-disposal check.
+            savedMessage = message;
+
             // Save this test for last; make sure EventDispatcher catches InvalidPropertyException.
             message.getString("nonexistent_string");
             fFail("EventDispatcher should catch InvalidPropertyException");
diff --git a/widget/android/NativeJSContainer.cpp b/widget/android/NativeJSContainer.cpp
index 4730f43027c..b6e2d2091b5 100644
--- a/widget/android/NativeJSContainer.cpp
+++ b/widget/android/NativeJSContainer.cpp
@@ -14,7 +14,6 @@
 #include "nsJSUtils.h"
 
 #include <mozilla/Vector.h>
-#include <mozilla/WeakPtr.h>
 #include <mozilla/jni/Accessors.h>
 #include <mozilla/jni/Refs.h>
 #include <mozilla/jni/Utils.h>
@@ -104,8 +103,7 @@ public:
 } // namepsace
 
 class NativeJSContainerImpl final
-    : public SupportsWeakPtr<NativeJSContainerImpl>
-    , public NativeJSObject::Natives<NativeJSContainerImpl>
+    : public NativeJSObject::Natives<NativeJSContainerImpl>
     , public NativeJSContainer::Natives<NativeJSContainerImpl>
 {
     typedef NativeJSContainerImpl Self;
@@ -576,46 +574,46 @@ class NativeJSContainerImpl final
         return (this->*Prop::FromValue)(val);
     }
 
+    NativeJSObject::LocalRef CreateChild(JS::HandleObject object)
+    {
+        auto instance = NativeJSObject::New();
+        mozilla::UniquePtr<NativeJSContainerImpl> impl(
+                new NativeJSContainerImpl(instance.Env(), mJSContext, object));
+
+        ObjectBase::AttachNative(instance, mozilla::Move(impl));
+        mChildren.append(NativeJSObject::GlobalRef(instance));
+        return instance;
+    }
+
     NativeJSContainerImpl(JNIEnv* env, JSContext* cx, JS::HandleObject object)
         : mEnv(env)
         , mJSContext(cx)
         , mJSObject(cx, object)
     {}
 
+public:
     ~NativeJSContainerImpl()
     {
         // Dispose of all children on destruction. The children will in turn
         // dispose any of their children (i.e. our grandchildren) and so on.
-        NativeJSObject::LocalRef childObj(mEnv);
+        NativeJSObject::LocalRef child(mEnv);
         for (size_t i = 0; i < mChildren.length(); i++) {
-            childObj = mChildren[i];
-            Self* const child = ObjectBase::GetNative(childObj);
-            child->ObjectBase::DisposeNative(childObj);
-            delete child;
+            child = mChildren[i];
+            ObjectBase::GetNative(child)->ObjectBase::DisposeNative(child);
         }
     }
 
-    NativeJSObject::LocalRef CreateChild(JS::HandleObject object)
-    {
-        auto instance = NativeJSObject::New();
-        (new NativeJSContainerImpl(instance.Env(), mJSContext, object))
-                ->ObjectBase::AttachNative(instance);
-        mChildren.append(NativeJSObject::GlobalRef(instance));
-        return instance;
-    }
-
-public:
     static NativeJSContainer::LocalRef
     CreateInstance(JSContext* cx, JS::HandleObject object)
     {
         auto instance = NativeJSContainer::New();
-        (new NativeJSContainerImpl(instance.Env(), cx, object))
-                ->ContainerBase::AttachNative(instance);
+        mozilla::UniquePtr<NativeJSContainerImpl> impl(
+                new NativeJSContainerImpl(instance.Env(), cx, object));
+
+        ContainerBase::AttachNative(instance, mozilla::Move(impl));
         return instance;
     }
 
-    MOZ_DECLARE_WEAKREFERENCE_TYPENAME(NativeJSContainerImpl)
-
     // NativeJSContainer methods
 
     void DisposeNative(const NativeJSContainer::LocalRef& instance)
@@ -624,7 +622,6 @@ public:
             return;
         }
         ContainerBase::DisposeNative(instance);
-        delete this;
     }
 
     NativeJSContainer::LocalRef Clone()