Backout changesets 654a3fc28fa2 and 88fefd05fb64 (bug 1017862) for Cpp and mochitest failures on a CLOSED TREE. r=bustage

js/src/jsproxy.cpp

@@ -88,7 +88,6 @@ BaseProxyHandler::BaseProxyHandler(const void *family)
 
 BaseProxyHandler::~BaseProxyHandler()
 {
-    MOZ_RELEASE_ASSERT(JS_IsShutDown(), "Proxy handler destructor called with engine running?");
 }
 
 bool
@@ -738,6 +737,7 @@ class ScriptedIndirectProxyHandler : public BaseProxyHandler
 {
   public:
     ScriptedIndirectProxyHandler();
+    virtual ~ScriptedIndirectProxyHandler();
 
     /* ES5 Harmony fundamental proxy traps. */
     virtual bool preventExtensions(JSContext *cx, HandleObject proxy) MOZ_OVERRIDE;
@@ -799,6 +799,10 @@ ScriptedIndirectProxyHandler::ScriptedIndirectProxyHandler()
 {
 }
 
+ScriptedIndirectProxyHandler::~ScriptedIndirectProxyHandler()
+{
+}
+
 bool
 ScriptedIndirectProxyHandler::isExtensible(JSContext *cx, HandleObject proxy, bool *extensible)
 {
@@ -1051,6 +1055,7 @@ ScriptedIndirectProxyHandler ScriptedIndirectProxyHandler::singleton;
 class ScriptedDirectProxyHandler : public DirectProxyHandler {
   public:
     ScriptedDirectProxyHandler();
+    virtual ~ScriptedDirectProxyHandler();
 
     /* ES5 Harmony fundamental proxy traps. */
     virtual bool preventExtensions(JSContext *cx, HandleObject proxy) MOZ_OVERRIDE;
@@ -1364,6 +1369,10 @@ ScriptedDirectProxyHandler::ScriptedDirectProxyHandler()
 {
 }
 
+ScriptedDirectProxyHandler::~ScriptedDirectProxyHandler()
+{
+}
+
 bool
 ScriptedDirectProxyHandler::preventExtensions(JSContext *cx, HandleObject proxy)
 {