diff --git a/js/src/shell/Makefile.in b/js/src/shell/Makefile.in
index e5acdd3a294..f3ee6e93e64 100644
--- a/js/src/shell/Makefile.in
+++ b/js/src/shell/Makefile.in
@@ -14,7 +14,6 @@ include $(DEPTH)/config/autoconf.mk
 PROGRAM         = js$(BIN_SUFFIX)
 CPPSRCS		= \
   js.cpp \
-  jsworkers.cpp \
   jsoptparse.cpp \
   jsheaptools.cpp \
   $(NULL)
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index c4b832278ec..8bdb810c066 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -51,7 +51,6 @@
 #include "prmjtime.h"
 
 #include "jsoptparse.h"
-#include "jsworkers.h"
 #include "jsheaptools.h"
 
 #include "jsinferinlines.h"
@@ -157,10 +156,6 @@ bool gQuitting = false;
 bool gGotError = false;
 FILE *gErrFile = NULL;
 FILE *gOutFile = NULL;
-#ifdef JS_THREADSAFE
-JSObject *gWorkers = NULL;
-js::workers::ThreadPool *gWorkerThreadPool = NULL;
-#endif
 
 static bool reportWarnings = true;
 static bool compileOnly = false;
@@ -1207,10 +1202,6 @@ Quit(JSContext *cx, unsigned argc, jsval *vp)
     JS_ConvertArguments(cx, argc, JS_ARGV(cx, vp), "/ i", &gExitCode);
 
     gQuitting = true;
-#ifdef JS_THREADSAFE
-    if (gWorkerThreadPool)
-        js::workers::terminateAll(gWorkerThreadPool);
-#endif
     return false;
 }
 
@@ -3035,10 +3026,6 @@ CancelExecution(JSRuntime *rt)
     gCanceled = true;
     if (gExitCode == 0)
         gExitCode = EXITCODE_TIMEOUT;
-#ifdef JS_THREADSAFE
-    if (gWorkerThreadPool)
-        js::workers::terminateAll(gWorkerThreadPool);
-#endif
     JS_TriggerOperationCallback(rt);
 
     static const char msg[] = "Script runs for too long, terminating.\n";
@@ -4700,29 +4687,8 @@ Shell(JSContext *cx, OptionParser *op, char **envp)
         return 1;
     JS_SetPrivate(envobj, envp);
 
-#ifdef JS_THREADSAFE
-    class ShellWorkerHooks : public js::workers::WorkerHooks {
-    public:
-        JSObject *newGlobalObject(JSContext *cx) {
-            return NewGlobalObject(cx);
-        }
-    };
-    ShellWorkerHooks hooks;
-    if (!JS_AddNamedObjectRoot(cx, &gWorkers, "Workers") ||
-        (gWorkerThreadPool = js::workers::init(cx, &hooks, glob, &gWorkers)) == NULL) {
-        return 1;
-    }
-#endif
-
     int result = ProcessArgs(cx, glob, op);
 
-#ifdef JS_THREADSAFE
-    js::workers::finish(cx, gWorkerThreadPool);
-    JS_RemoveObjectRoot(cx, &gWorkers);
-    if (result == 0)
-        result = gExitCode;
-#endif
-
     if (enableDisassemblyDumps)
         JS_DumpCompartmentPCCounts(cx);
 
diff --git a/js/src/shell/jsworkers.cpp b/js/src/shell/jsworkers.cpp
deleted file mode 100644
index c6442c7dbcf..00000000000
--- a/js/src/shell/jsworkers.cpp
+++ /dev/null
@@ -1,1287 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifdef JS_THREADSAFE
-
-#include "mozilla/Attributes.h"
-
-#include <string.h>
-#include "prthread.h"
-#include "prlock.h"
-#include "prcvar.h"
-#include "jsapi.h"
-#include "jscntxt.h"
-#include "jsdbgapi.h"
-#include "jsfriendapi.h"
-#include "jslock.h"
-#include "jsworkers.h"
-
-extern size_t gMaxStackSize;
-
-class AutoLock
-{
-  private:
-    PRLock *lock;
-
-  public:
-    AutoLock(PRLock *lock) : lock(lock) { PR_Lock(lock); }
-    ~AutoLock() { PR_Unlock(lock); }
-};
-
-/*
- * JavaScript shell workers.
- *
- * == Object lifetime rules ==
- *
- *   - The ThreadPool lasts from init() to finish().
- *
- *   - The ThreadPool owns the MainQueue and the WorkerQueue. Those live from
- *     the time the first Worker is created until finish().
- *
- *   - Each JS Worker object has the same lifetime as the corresponding C++
- *     Worker object. A Worker is live if (a) the Worker JSObject is still
- *     live; (b) the Worker has an incoming event pending or running; (c) it
- *     has sent an outgoing event to its parent that is still pending; or (d)
- *     it has any live child Workers.
- *
- *   - finish() continues to wait for events until all threads are idle.
- *
- * Event objects, however, are basically C++-only. The JS Event objects are
- * just plain old JSObjects. They don't keep anything alive.
- *
- * == Locking scheme ==
- *
- * When mixing mutexes and the JSAPI request model, there are two choices:
- *
- *   - Always nest the mutexes in requests. Since threads in requests are not
- *     supposed to block, this means the mutexes must be only briefly held.
- *
- *   - Never nest the mutexes in requests. Since this allows threads to race
- *     with the GC, trace() methods must go through the mutexes just like
- *     everyone else.
- *
- * This code uses the latter approach for all locks.
- *
- * In one case, a thread holding a Worker's mutex can acquire the mutex of one
- * of its child Workers. See Worker::terminateSelf. (This can't deadlock because
- * the parent-child relationship is a partial order.)
- */
-
-namespace js {
-namespace workers {
-
-template <class T, class AllocPolicy>
-class Queue {
-    typedef Vector<T, 4, AllocPolicy> Vec;
-    Vec v1;
-    Vec v2;
-    Vec *front;
-    Vec *back;
-
-    Queue(const Queue &) MOZ_DELETE;
-    Queue & operator=(const Queue &) MOZ_DELETE;
-
-  public:
-    Queue() : front(&v1), back(&v2) {}
-    bool push(T t) { return back->append(t); }
-    bool empty() { return front->empty() && back->empty(); }
-
-    T pop() {
-        if (front->empty()) {
-            js::Reverse(back->begin(), back->end());
-            Vec *tmp = front;
-            front = back;
-            back = tmp;
-        }
-        T item = front->back();
-        front->popBack();
-        return item;
-    }
-
-    void clear() {
-        v1.clear();
-        v2.clear();
-    }
-
-    void trace(JSTracer *trc) {
-        for (T *p = v1.begin(); p != v1.end(); p++)
-            (*p)->trace(trc);
-        for (T *p = v2.begin(); p != v2.end(); p++)
-            (*p)->trace(trc);
-    }
-};
-
-class Event;
-class ThreadPool;
-class Worker;
-
-class WorkerParent {
-  protected:
-    typedef HashSet<Worker *, DefaultHasher<Worker *>, SystemAllocPolicy> ChildSet;
-    ChildSet children;
-
-    bool initWorkerParent() { return children.init(8); }
-
-  public:
-    virtual PRLock *getLock() = 0;
-    virtual ThreadPool *getThreadPool() = 0;
-    virtual bool post(Event *item) = 0;  // false on OOM or queue closed
-    virtual void trace(JSTracer *trc) = 0;
-
-    bool addChild(Worker *w) {
-        AutoLock hold(getLock());
-        return children.put(w);
-    }
-
-    // This must be called only from GC or when all threads are shut down. It
-    // does not bother with locking.
-    void removeChild(Worker *w) {
-        ChildSet::Ptr p = children.lookup(w);
-        JS_ASSERT(p);
-        children.remove(p);
-    }
-
-    void disposeChildren();
-    void notifyTerminating();
-};
-
-template <class T>
-class ThreadSafeQueue
-{
-  protected:
-    Queue<T, SystemAllocPolicy> queue;
-    PRLock *lock;
-    PRCondVar *condvar;
-    bool closed;
-
-  private:
-    Vector<T, 8, SystemAllocPolicy> busy;
-
-  protected:
-    ThreadSafeQueue() : lock(NULL), condvar(NULL), closed(false) {}
-
-    ~ThreadSafeQueue() {
-        if (condvar)
-            PR_DestroyCondVar(condvar);
-        if (lock)
-            PR_DestroyLock(lock);
-    }
-
-    // Called by take() with the lock held.
-    virtual bool shouldStop() { return closed; }
-
-  public:
-    bool initThreadSafeQueue() {
-        JS_ASSERT(!lock);
-        JS_ASSERT(!condvar);
-        return (lock = PR_NewLock()) && (condvar = PR_NewCondVar(lock));
-    }
-
-    bool post(T t) {
-        AutoLock hold(lock);
-        if (closed)
-            return false;
-        if (queue.empty())
-            PR_NotifyAllCondVar(condvar);
-        return queue.push(t);
-    }
-
-    void close() {
-        AutoLock hold(lock);
-        closed = true;
-        queue.clear();
-        PR_NotifyAllCondVar(condvar);
-    }
-
-    // The caller must hold the lock.
-    bool take(T *t) {
-        while (queue.empty()) {
-            if (shouldStop())
-                return false;
-            PR_WaitCondVar(condvar, PR_INTERVAL_NO_TIMEOUT);
-        }
-        *t = queue.pop();
-        busy.append(*t);
-        return true;
-    }
-
-    // The caller must hold the lock.
-    void drop(T item) {
-        for (T *p = busy.begin(); p != busy.end(); p++) {
-            if (*p == item) {
-                *p = busy.back();
-                busy.popBack();
-                return;
-            }
-        }
-        JS_NOT_REACHED("removeBusy");
-    }
-
-    bool lockedIsIdle() { return busy.empty() && queue.empty(); }
-
-    bool isIdle() {
-        AutoLock hold(lock);
-        return lockedIsIdle();
-    }
-
-    void wake() {
-        AutoLock hold(lock);
-        PR_NotifyAllCondVar(condvar);
-    }
-
-    void trace(JSTracer *trc) {
-        AutoLock hold(lock);
-        for (T *p = busy.begin(); p != busy.end(); p++)
-            (*p)->trace(trc);
-        queue.trace(trc);
-    }
-};
-
-class MainQueue;
-
-class Event
-{
-  protected:
-    virtual ~Event() { JS_ASSERT(!data); }
-
-    WorkerParent *recipient;
-    Worker *child;
-    uint64_t *data;
-    size_t nbytes;
-
-  public:
-    enum Result { fail = JS_FALSE, ok = JS_TRUE, forwardToParent };
-
-    virtual void destroy(JSContext *cx) {
-        JS_free(cx, data);
-#ifdef DEBUG
-        data = NULL;
-#endif
-        delete this;
-    }
-
-    void setChildAndRecipient(Worker *aChild, WorkerParent *aRecipient) {
-        child = aChild;
-        recipient = aRecipient;
-    }
-
-    bool deserializeData(JSContext *cx, jsval *vp) {
-        return !!JS_ReadStructuredClone(cx, data, nbytes, JS_STRUCTURED_CLONE_VERSION, vp,
-                                        NULL, NULL);
-    }
-
-    virtual Result process(JSContext *cx) = 0;
-
-    inline void trace(JSTracer *trc);
-
-    template <class EventType>
-    static EventType *createEvent(JSContext *cx, WorkerParent *recipient, Worker *child,
-                                  jsval v)
-    {
-        uint64_t *data;
-        size_t nbytes;
-        if (!JS_WriteStructuredClone(cx, v, &data, &nbytes, NULL, NULL))
-            return NULL;
-
-        EventType *event = new EventType;
-        if (!event) {
-            JS_ReportOutOfMemory(cx);
-            return NULL;
-        }
-        event->recipient = recipient;
-        event->child = child;
-        event->data = data;
-        event->nbytes = nbytes;
-        return event;
-    }
-
-    Result dispatch(JSContext *cx, JSObject *thisobj, const char *dataPropName,
-                    const char *methodName, Result noHandler)
-    {
-        if (!data)
-            return fail;
-
-        JSBool found;
-        if (!JS_HasProperty(cx, thisobj, methodName, &found))
-            return fail;
-        if (!found)
-            return noHandler;
-
-        // Create event object.
-        jsval v;
-        if (!deserializeData(cx, &v))
-            return fail;
-        JSObject *obj = JS_NewObject(cx, NULL, NULL, NULL);
-        if (!obj || !JS_DefineProperty(cx, obj, dataPropName, v, NULL, NULL, 0))
-            return fail;
-
-        // Call event handler.
-        jsval argv[1] = { OBJECT_TO_JSVAL(obj) };
-        jsval rval = JSVAL_VOID;
-        return Result(JS_CallFunctionName(cx, thisobj, methodName, 1, argv, &rval));
-    }
-};
-
-typedef ThreadSafeQueue<Event *> EventQueue;
-
-class MainQueue MOZ_FINAL : public EventQueue, public WorkerParent
-{
-  private:
-    ThreadPool *threadPool;
-
-  public:
-    explicit MainQueue(ThreadPool *tp) : threadPool(tp) {}
-
-    ~MainQueue() {
-        JS_ASSERT(queue.empty());
-    }
-
-    bool init() { return initThreadSafeQueue() && initWorkerParent(); }
-
-    void destroy(JSContext *cx) {
-        while (!queue.empty())
-            queue.pop()->destroy(cx);
-        delete this;
-    }
-
-    virtual PRLock *getLock() { return lock; }
-    virtual ThreadPool *getThreadPool() { return threadPool; }
-
-  protected:
-    virtual bool shouldStop();
-
-  public:
-    virtual bool post(Event *event) { return EventQueue::post(event); }
-
-    virtual void trace(JSTracer *trc);
-
-    void traceChildren(JSTracer *trc) { EventQueue::trace(trc); }
-
-    JSBool mainThreadWork(JSContext *cx, bool continueOnError) {
-        JSAutoSuspendRequest suspend(cx);
-        AutoLock hold(lock);
-
-        Event *event;
-        while (take(&event)) {
-            PR_Unlock(lock);
-            Event::Result result;
-            {
-                JSAutoRequest req(cx);
-                result = event->process(cx);
-                if (result == Event::forwardToParent) {
-                    // FIXME - pointlessly truncates the string to 8 bits
-                    jsval data;
-                    JSAutoByteString bytes;
-                    if (event->deserializeData(cx, &data) &&
-                        JSVAL_IS_STRING(data) &&
-                        bytes.encode(cx, JSVAL_TO_STRING(data))) {
-                        JS_ReportError(cx, "%s", bytes.ptr());
-                    } else {
-                        JS_ReportOutOfMemory(cx);
-                    }
-                    result = Event::fail;
-                }
-                if (result == Event::fail && continueOnError) {
-                    if (JS_IsExceptionPending(cx) && !JS_ReportPendingException(cx))
-                        JS_ClearPendingException(cx);
-                    result = Event::ok;
-                }
-            }
-            PR_Lock(lock);
-            drop(event);
-            event->destroy(cx);
-            if (result != Event::ok)
-                return false;
-        }
-        return true;
-    }
-};
-
-/*
- * A queue of workers.
- *
- * We keep a queue of workers with pending events, rather than a queue of
- * events, so that two threads won't try to run a Worker at the same time.
- */
-class WorkerQueue MOZ_FINAL : public ThreadSafeQueue<Worker *>
-{
-  private:
-    MainQueue *main;
-
-  public:
-    explicit WorkerQueue(MainQueue *main) : main(main) {}
-
-    void work();
-};
-
-/* The top-level object that owns everything else. */
-class ThreadPool
-{
-  private:
-    enum { threadCount = 6 };
-
-    JSObject *obj;
-    WorkerHooks *hooks;
-    MainQueue *mq;
-    WorkerQueue *wq;
-    PRThread *threads[threadCount];
-    int32_t terminating;
-
-    static JSClass jsClass;
-
-    static void start(void* arg) {
-        PR_SetCurrentThreadName("JS Worker");
-        ((WorkerQueue *) arg)->work();
-    }
-
-    explicit ThreadPool(WorkerHooks *hooks) : hooks(hooks), mq(NULL), wq(NULL), terminating(0) {
-        for (int i = 0; i < threadCount; i++)
-            threads[i] = NULL;
-    }
-
-  public:
-    ~ThreadPool() {
-        JS_ASSERT(!mq);
-        JS_ASSERT(!wq);
-        JS_ASSERT(!threads[0]);
-    }
-
-    static ThreadPool *create(JSContext *cx, WorkerHooks *hooks) {
-        ThreadPool *tp = new ThreadPool(hooks);
-        if (!tp) {
-            JS_ReportOutOfMemory(cx);
-            return NULL;
-        }
-
-        JSObject *obj = JS_NewObject(cx, &jsClass, NULL, NULL);
-        if (!obj) {
-            delete tp;
-            return NULL;
-        }
-        JS_SetPrivate(obj, tp);
-        tp->obj = obj;
-        return tp;
-    }
-
-    JSObject *asObject() { return obj; }
-    WorkerHooks *getHooks() { return hooks; }
-    WorkerQueue *getWorkerQueue() { return wq; }
-    MainQueue *getMainQueue() { return mq; }
-    bool isTerminating() { return terminating != 0; }
-
-    /*
-     * Main thread only. Requires request (to prevent GC, which could see the
-     * object in an inconsistent state).
-     */
-    bool start(JSContext *cx) {
-        JS_ASSERT(!mq && !wq);
-        mq = new MainQueue(this);
-        if (!mq || !mq->init()) {
-            mq->destroy(cx);
-            mq = NULL;
-            return false;
-        }
-        wq = new WorkerQueue(mq);
-        if (!wq || !wq->initThreadSafeQueue()) {
-            delete wq;
-            wq = NULL;
-            mq->destroy(cx);
-            mq = NULL;
-            return false;
-        }
-        JSAutoSuspendRequest suspend(cx);
-        bool ok = true;
-        for (int i = 0; i < threadCount; i++) {
-            threads[i] = PR_CreateThread(PR_USER_THREAD, start, wq, PR_PRIORITY_NORMAL,
-                                         PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
-            if (!threads[i]) {
-                shutdown(cx);
-                ok = false;
-                break;
-            }
-        }
-        return ok;
-    }
-
-    void terminateAll() {
-        // See comment about JS_ATOMIC_SET in the implementation of
-        // JS_TriggerOperationCallback.
-        JS_ATOMIC_SET(&terminating, 1);
-        if (mq)
-            mq->notifyTerminating();
-    }
-
-    /* This context is used only to free memory. */
-    void shutdown(JSContext *cx) {
-        wq->close();
-        for (int i = 0; i < threadCount; i++) {
-            if (threads[i]) {
-                PR_JoinThread(threads[i]);
-                threads[i] = NULL;
-            }
-        }
-
-        delete wq;
-        wq = NULL;
-
-        mq->disposeChildren();
-        mq->destroy(cx);
-        mq = NULL;
-        terminating = 0;
-    }
-
-  private:
-    static void jsTraceThreadPool(JSTracer *trc, JSObject *obj) {
-        ThreadPool *tp = unwrap(obj);
-        if (tp->mq) {
-            tp->mq->traceChildren(trc);
-            tp->wq->trace(trc);
-        }
-    }
-
-
-    static void jsFinalize(JSFreeOp *fop, JSObject *obj) {
-        if (ThreadPool *tp = unwrap(obj))
-            delete tp;
-    }
-
-  public:
-    static ThreadPool *unwrap(JSObject *obj) {
-        JS_ASSERT(JS_GetClass(obj) == &jsClass);
-        return (ThreadPool *) JS_GetPrivate(obj);
-    }
-};
-
-/*
- * A Worker is always in one of 4 states, except when it is being initialized
- * or destroyed, or its lock is held:
- *   - idle       (!terminated && current == NULL && events.empty())
- *   - enqueued   (!terminated && current == NULL && !events.empty())
- *   - busy       (!terminated && current != NULL)
- *   - terminated (terminated && current == NULL && events.empty())
- *
- * Separately, there is a terminateFlag that other threads can set
- * asynchronously to tell the Worker to terminate.
- */
-class Worker MOZ_FINAL : public WorkerParent
-{
-  private:
-    ThreadPool *threadPool;
-    WorkerParent *parent;
-    JSObject *object;  // Worker object exposed to parent
-    JSRuntime *runtime;
-    JSContext *context;
-    PRLock *lock;
-    Queue<Event *, SystemAllocPolicy> events;  // owning pointers to pending events
-    Event *current;
-    bool terminated;
-    int32_t terminateFlag;
-
-    static JSClass jsWorkerClass;
-
-    Worker()
-        : threadPool(NULL), parent(NULL), object(NULL), runtime(NULL),
-          context(NULL), lock(NULL), current(NULL), terminated(false), terminateFlag(0) {}
-
-    bool init(JSContext *parentcx, WorkerParent *parent, JSObject *obj) {
-        JS_ASSERT(!threadPool && !this->parent && !object && !lock);
-
-        if (!initWorkerParent() || !parent->addChild(this))
-            return false;
-        threadPool = parent->getThreadPool();
-        this->parent = parent;
-        this->object = obj;
-        lock = PR_NewLock();
-        if (!lock || !createRuntime(parentcx) || !createContext(parentcx, parent))
-            return false;
-        JS_SetPrivate(obj, this);
-        return true;
-    }
-
-    bool createRuntime(JSContext *parentcx) {
-        runtime = JS_NewRuntime(1L * 1024L * 1024L);
-        if (!runtime) {
-            JS_ReportOutOfMemory(parentcx);
-            return false;
-        }
-        JS_ClearRuntimeThread(runtime);
-        return true;
-    }
-
-    bool createContext(JSContext *parentcx, WorkerParent *parent) {
-        JSAutoSetRuntimeThread guard(runtime);
-        context = JS_NewContext(runtime, 8192);
-        if (!context)
-            return false;
-
-        // The Worker has a strong reference to the global; see jsTraceWorker.
-        // JSOPTION_UNROOTED_GLOBAL ensures that when the worker becomes
-        // unreachable, it and its global object can be collected. Otherwise
-        // the cx->globalObject root would keep them both alive forever.
-        JS_SetOptions(context, JS_GetOptions(parentcx) | JSOPTION_UNROOTED_GLOBAL |
-                                                         JSOPTION_DONT_REPORT_UNCAUGHT);
-        JS_SetVersion(context, JS_GetVersion(parentcx));
-        JS_SetContextPrivate(context, this);
-        JS_SetOperationCallback(context, jsOperationCallback);
-        JS_BeginRequest(context);
-
-        JSObject *global = threadPool->getHooks()->newGlobalObject(context);
-        JSObject *post, *proto, *ctor;
-        if (!global)
-            goto bad;
-        JS_SetGlobalObject(context, global);
-
-        // Because the Worker is completely isolated from the rest of the
-        // runtime, and because any pending events on a Worker keep the Worker
-        // alive, this postMessage function cannot be called after the Worker
-        // is collected.  Therefore it's safe to stash a pointer (a weak
-        // reference) to the C++ Worker object in the reserved slot.
-        post = JS_GetFunctionObject(
-                   js::DefineFunctionWithReserved(context, global, "postMessage",
-                                                  (JSNative) jsPostMessageToParent, 1, 0));
-        if (!post)
-            goto bad;
-
-        js::SetFunctionNativeReserved(post, 0, PRIVATE_TO_JSVAL(this));
-
-        proto = js::InitClassWithReserved(context, global, NULL, &jsWorkerClass, jsConstruct, 1,
-                                          NULL, jsMethods, NULL, NULL);
-        if (!proto)
-            goto bad;
-
-        ctor = JS_GetConstructor(context, proto);
-        if (!ctor)
-            goto bad;
-
-        js::SetFunctionNativeReserved(ctor, 0, PRIVATE_TO_JSVAL(this));
-
-        JS_EndRequest(context);
-        return true;
-
-    bad:
-        JS_EndRequest(context);
-        JS_DestroyContext(context);
-        context = NULL;
-        return false;
-    }
-
-    static void jsTraceWorker(JSTracer *trc, JSObject *obj) {
-        JS_ASSERT(JS_GetClass(obj) == &jsWorkerClass);
-        if (Worker *w = (Worker *) JS_GetPrivate(obj)) {
-            w->parent->trace(trc);
-            w->events.trace(trc);
-            if (w->current)
-                w->current->trace(trc);
-            JS_CALL_OBJECT_TRACER(trc, JS_GetGlobalObject(w->context), "Worker global");
-        }
-    }
-
-    static void jsFinalize(JSFreeOp *fop, JSObject *obj) {
-        JS_ASSERT(JS_GetClass(obj) == &jsWorkerClass);
-        if (Worker *w = (Worker *) JS_GetPrivate(obj))
-            delete w;
-    }
-
-    static JSBool jsOperationCallback(JSContext *cx) {
-        Worker *w = (Worker *) JS_GetContextPrivate(cx);
-        JSAutoSuspendRequest suspend(cx);  // avoid nesting w->lock in a request
-        return !w->checkTermination();
-    }
-
-    static JSBool jsResolveGlobal(JSContext *cx, JSObject *obj, jsid id, unsigned flags,
-                                  JSObject **objp)
-    {
-        JSBool resolved;
-
-        if (!JS_ResolveStandardClass(cx, obj, id, &resolved))
-            return false;
-        if (resolved)
-            *objp = obj;
-
-        return true;
-    }
-
-    static JSBool jsPostMessageToParent(JSContext *cx, unsigned argc, jsval *vp);
-    static JSBool jsPostMessageToChild(JSContext *cx, unsigned argc, jsval *vp);
-    static JSBool jsTerminate(JSContext *cx, unsigned argc, jsval *vp);
-
-    bool checkTermination() {
-        AutoLock hold(lock);
-        return lockedCheckTermination();
-    }
-
-    bool lockedCheckTermination() {
-        if (terminateFlag || threadPool->isTerminating()) {
-            terminateSelf();
-            terminateFlag = 0;
-        }
-        return terminated;
-    }
-
-    // Caller must hold the lock.
-    void terminateSelf() {
-        terminated = true;
-        while (!events.empty())
-            events.pop()->destroy(context);
-
-        // Tell the children to shut down too. An arbitrarily silly amount of
-        // processing could happen before the whole tree is terminated; but
-        // this way we don't have to worry about blowing the C stack.
-        for (ChildSet::Enum e(children); !e.empty(); e.popFront())
-            e.front()->setTerminateFlag();  // note: nesting locks here
-    }
-
-  public:
-    ~Worker() {
-        if (parent)
-            parent->removeChild(this);
-        dispose();
-    }
-
-    void dispose() {
-        JS_ASSERT(!current);
-        while (!events.empty())
-            events.pop()->destroy(context);
-        if (lock) {
-            PR_DestroyLock(lock);
-            lock = NULL;
-        }
-        if (runtime)
-            JS_SetRuntimeThread(runtime);
-        if (context) {
-            JS_DestroyContextNoGC(context);
-            context = NULL;
-        }
-        if (runtime) {
-            JS_DestroyRuntime(runtime);
-            runtime = NULL;
-        }
-        object = NULL;
-
-        // Do not call parent->removeChild(). This is called either from
-        // ~Worker, which calls it for us; or from parent->disposeChildren or
-        // Worker::create, which require that it not be called.
-        parent = NULL;
-        disposeChildren();
-    }
-
-    static Worker *create(JSContext *parentcx, WorkerParent *parent,
-                          JSString *scriptName, JSObject *obj);
-
-    JSObject *asObject() { return object; }
-
-    JSObject *getGlobal() { return JS_GetGlobalObject(context); }
-
-    WorkerParent *getParent() { return parent; }
-
-    virtual PRLock *getLock() { return lock; }
-
-    virtual ThreadPool *getThreadPool() { return threadPool; }
-
-    bool post(Event *event) {
-        AutoLock hold(lock);
-        if (terminated)
-            return false;
-        if (!current && events.empty() && !threadPool->getWorkerQueue()->post(this))
-            return false;
-        return events.push(event);
-    }
-
-    void setTerminateFlag() {
-        AutoLock hold(lock);
-        terminateFlag = true;
-        if (current)
-            JS_TriggerOperationCallback(runtime);
-    }
-
-    void notifyTerminating() {
-        setTerminateFlag();
-        WorkerParent::notifyTerminating();
-    }
-
-    void processOneEvent();
-
-    /* Trace method to be called from C++. */
-    void trace(JSTracer *trc) {
-        // Just mark the JSObject. If we haven't already been marked,
-        // jsTraceWorker will be called, at which point we'll trace referents.
-        JS_CALL_OBJECT_TRACER(trc, object, "queued Worker");
-    }
-
-    static bool getWorkerParentFromConstructor(JSContext *cx, JSObject *ctor, WorkerParent **p) {
-        jsval v = js::GetFunctionNativeReserved(ctor, 0);
-        if (JSVAL_IS_VOID(v)) {
-            // This means ctor is the root Worker constructor (created in
-            // Worker::initWorkers as opposed to Worker::createContext, which sets up
-            // Worker sandboxes) and nothing is initialized yet.
-            v = js::GetFunctionNativeReserved(ctor, 1);
-            ThreadPool *threadPool = (ThreadPool *) JSVAL_TO_PRIVATE(v);
-            if (!threadPool->start(cx))
-                return false;
-            WorkerParent *parent = threadPool->getMainQueue();
-            js::SetFunctionNativeReserved(ctor, 0, PRIVATE_TO_JSVAL(parent));
-            *p = parent;
-            return true;
-        }
-        *p = (WorkerParent *) JSVAL_TO_PRIVATE(v);
-        return true;
-    }
-
-    static JSBool jsConstruct(JSContext *cx, unsigned argc, jsval *vp) {
-        /*
-         * We pretend to implement write barriers on shell workers (by setting
-         * the JSCLASS_IMPLEMENTS_BARRIERS), but we don't. So we immediately
-         * disable incremental GC if shell workers are ever used.
-         */
-        js::DisableIncrementalGC(JS_GetRuntime(cx));
-
-        WorkerParent *parent;
-        if (!getWorkerParentFromConstructor(cx, JSVAL_TO_OBJECT(JS_CALLEE(cx, vp)), &parent))
-            return false;
-
-
-        JSString *scriptName = JS_ValueToString(cx, argc ? JS_ARGV(cx, vp)[0] : JSVAL_VOID);
-        if (!scriptName)
-            return false;
-
-        JSObject *obj = JS_NewObject(cx, &jsWorkerClass, NULL, NULL);
-        if (!obj || !create(cx, parent, scriptName, obj))
-            return false;
-        JS_SET_RVAL(cx, vp, OBJECT_TO_JSVAL(obj));
-        return true;
-    }
-
-    static JSFunctionSpec jsMethods[3];
-    static JSFunctionSpec jsStaticMethod[2];
-
-    static ThreadPool *initWorkers(JSContext *cx, WorkerHooks *hooks, JSObject *global,
-                                   JSObject **objp) {
-        // Create the ThreadPool object and its JSObject wrapper.
-        ThreadPool *threadPool = ThreadPool::create(cx, hooks);
-        if (!threadPool)
-            return NULL;
-
-        // Root the ThreadPool JSObject early.
-        *objp = threadPool->asObject();
-
-        // Create the Worker constructor.
-        JSObject *proto = js::InitClassWithReserved(cx, global, NULL, &jsWorkerClass,
-                                                    jsConstruct, 1,
-                                                    NULL, jsMethods, NULL, NULL);
-        if (!proto)
-            return NULL;
-
-        // Stash a pointer to the ThreadPool in constructor reserved slot 1.
-        // It will be used later when lazily creating the MainQueue.
-        JSObject *ctor = JS_GetConstructor(cx, proto);
-        js::SetFunctionNativeReserved(ctor, 1, PRIVATE_TO_JSVAL(threadPool));
-
-        return threadPool;
-    }
-};
-
-class InitEvent : public Event
-{
-  public:
-    static InitEvent *create(JSContext *cx, Worker *worker, JSString *scriptName) {
-        return createEvent<InitEvent>(cx, worker, worker, STRING_TO_JSVAL(scriptName));
-    }
-
-    Result process(JSContext *cx) {
-        jsval s;
-        if (!deserializeData(cx, &s))
-            return fail;
-        JS_ASSERT(JSVAL_IS_STRING(s));
-        JSAutoByteString filename(cx, JSVAL_TO_STRING(s));
-        if (!filename)
-            return fail;
-
-        JSScript *script = JS_CompileUTF8File(cx, child->getGlobal(), filename.ptr());
-        if (!script)
-            return fail;
-
-        AutoValueRooter rval(cx);
-        JSBool ok = JS_ExecuteScript(cx, child->getGlobal(), script, rval.addr());
-        return Result(ok);
-    }
-};
-
-class DownMessageEvent : public Event
-{
-  public:
-    static DownMessageEvent *create(JSContext *cx, Worker *child, jsval data) {
-        return createEvent<DownMessageEvent>(cx, child, child, data);
-    }
-
-    Result process(JSContext *cx) {
-        return dispatch(cx, child->getGlobal(), "data", "onmessage", ok);
-    }
-};
-
-class UpMessageEvent : public Event
-{
-  public:
-    static UpMessageEvent *create(JSContext *cx, Worker *child, jsval data) {
-        return createEvent<UpMessageEvent>(cx, child->getParent(), child, data);
-    }
-
-    Result process(JSContext *cx) {
-        return dispatch(cx, child->asObject(), "data", "onmessage", ok);
-    }
-};
-
-class ErrorEvent : public Event
-{
-  public:
-    static ErrorEvent *create(JSContext *cx, Worker *child) {
-        JSString *data = NULL;
-        JS::Value exc;
-        if (JS_GetPendingException(cx, &exc)) {
-            AutoValueRooter tvr(cx, exc);
-            JS_ClearPendingException(cx);
-
-            // Determine what error message to put in the error event.
-            // If exc.message is a string, use that; otherwise use String(exc).
-            // (This is a little different from what web workers do.)
-            if (exc.isObject()) {
-                JS::Value msg;
-                if (!JS_GetProperty(cx, &exc.toObject(), "message", &msg))
-                    JS_ClearPendingException(cx);
-                else if (msg.isString())
-                    data = msg.toString();
-            }
-            if (!data) {
-                data = JS_ValueToString(cx, exc);
-                if (!data)
-                    return NULL;
-            }
-        }
-        return createEvent<ErrorEvent>(cx, child->getParent(), child,
-                                       data ? STRING_TO_JSVAL(data) : JSVAL_VOID);
-    }
-
-    Result process(JSContext *cx) {
-        return dispatch(cx, child->asObject(), "message", "onerror", forwardToParent);
-    }
-};
-
-} /* namespace workers */
-} /* namespace js */
-
-using namespace js::workers;
-
-void
-WorkerParent::disposeChildren()
-{
-    for (ChildSet::Enum e(children); !e.empty(); e.popFront()) {
-        e.front()->dispose();
-        e.removeFront();
-    }
-}
-
-void
-WorkerParent::notifyTerminating()
-{
-    AutoLock hold(getLock());
-    for (ChildSet::Range r = children.all(); !r.empty(); r.popFront())
-        r.front()->notifyTerminating();
-}
-
-bool
-MainQueue::shouldStop()
-{
-    // Note: This deliberately nests WorkerQueue::lock in MainQueue::lock.
-    // Releasing MainQueue::lock would risk a race -- isIdle() could return
-    // false, but the workers could become idle before we reacquire
-    // MainQueue::lock and go to sleep, and we would wait on the condvar
-    // forever.
-    return closed || threadPool->getWorkerQueue()->isIdle();
-}
-
-void
-MainQueue::trace(JSTracer *trc)
-{
-     JS_CALL_OBJECT_TRACER(trc, threadPool->asObject(), "MainQueue");
-}
-
-void
-WorkerQueue::work() {
-    AutoLock hold(lock);
-
-    Worker *w;
-    while (take(&w)) {  // can block outside the mutex
-        PR_Unlock(lock);
-        w->processOneEvent();     // enters request on w->context
-        PR_Lock(lock);
-        drop(w);
-
-        if (lockedIsIdle()) {
-            PR_Unlock(lock);
-            main->wake();
-            PR_Lock(lock);
-        }
-    }
-}
-
-const bool mswin =
-#ifdef XP_WIN
-    true
-#else
-    false
-#endif
-    ;
-
-template <class Ch> bool
-IsAbsolute(const Ch *filename)
-{
-    return filename[0] == '/' ||
-           (mswin && (filename[0] == '\\' || (filename[0] != '\0' && filename[1] == ':')));
-}
-
-// Note: base is a filename, not a directory name.
-static JSString *
-ResolveRelativePath(JSContext *cx, const char *base, JSString *filename)
-{
-    size_t fileLen = JS_GetStringLength(filename);
-    const jschar *fileChars = JS_GetStringCharsZ(cx, filename);
-    if (!fileChars)
-        return NULL;
-
-    if (IsAbsolute(fileChars))
-        return filename;
-
-    // Strip off the filename part of base.
-    size_t dirLen = -1;
-    for (size_t i = 0; base[i]; i++) {
-        if (base[i] == '/' || (mswin && base[i] == '\\'))
-            dirLen = i;
-    }
-
-    // If base is relative and contains no directories, use filename unchanged.
-    if (!IsAbsolute(base) && dirLen == (size_t) -1)
-        return filename;
-
-    // Otherwise return base[:dirLen + 1] + filename.
-    js::Vector<jschar, 0> result(cx);
-    size_t nchars;
-    if (!JS_DecodeBytes(cx, base, dirLen + 1, NULL, &nchars))
-        return NULL;
-    if (!result.reserve(dirLen + 1 + fileLen))
-        return NULL;
-    JS_ALWAYS_TRUE(result.resize(dirLen + 1));
-    if (!JS_DecodeBytes(cx, base, dirLen + 1, result.begin(), &nchars))
-        return NULL;
-    result.infallibleAppend(fileChars, fileLen);
-    return JS_NewUCStringCopyN(cx, result.begin(), result.length());
-}
-
-Worker *
-Worker::create(JSContext *parentcx, WorkerParent *parent, JSString *scriptName, JSObject *obj)
-{
-    Worker *w = new Worker();
-    if (!w || !w->init(parentcx, parent, obj)) {
-        delete w;
-        return NULL;
-    }
-
-    JSScript *script;
-    JS_DescribeScriptedCaller(parentcx, &script, NULL);
-    const char *base = JS_GetScriptFilename(parentcx, script);
-    JSString *scriptPath = ResolveRelativePath(parentcx, base, scriptName);
-    if (!scriptPath)
-        return NULL;
-
-    // Post an InitEvent to run the initialization script.
-    Event *event = InitEvent::create(parentcx, w, scriptPath);
-    if (!event)
-        return NULL;
-    if (!w->events.push(event) || !w->threadPool->getWorkerQueue()->post(w)) {
-        event->destroy(parentcx);
-        JS_ReportOutOfMemory(parentcx);
-        w->dispose();
-        return NULL;
-    }
-    return w;
-}
-
-void
-Worker::processOneEvent()
-{
-    Event *event = NULL;    /* init to shut GCC up */
-    {
-        AutoLock hold1(lock);
-        if (lockedCheckTermination() || events.empty())
-            return;
-
-        event = current = events.pop();
-    }
-
-    JS_SetRuntimeThread(runtime);
-
-    Event::Result result;
-    {
-        JSAutoRequest ar(context);
-        result = event->process(context);
-    }
-
-    // Note: we have to leave the above request before calling parent->post or
-    // checkTermination, both of which acquire locks.
-    if (result == Event::forwardToParent) {
-        event->setChildAndRecipient(this, parent);
-        if (parent->post(event)) {
-            event = NULL;  // to prevent it from being deleted below
-        } else {
-            JS_ReportOutOfMemory(context);
-            result = Event::fail;
-        }
-    }
-    if (result == Event::fail && !checkTermination()) {
-        JSAutoRequest ar(context);
-        Event *err = ErrorEvent::create(context, this);
-        if (err && !parent->post(err)) {
-            JS_ReportOutOfMemory(context);
-            err->destroy(context);
-            err = NULL;
-        }
-        if (!err) {
-            // FIXME - out of memory, probably should panic
-        }
-    }
-
-    if (event)
-        event->destroy(context);
-    JS_ClearRuntimeThread(runtime);
-
-    {
-        AutoLock hold2(lock);
-        current = NULL;
-        if (!lockedCheckTermination() && !events.empty()) {
-            // Re-enqueue this worker. OOM here effectively kills the worker.
-            if (!threadPool->getWorkerQueue()->post(this))
-                JS_ReportOutOfMemory(context);
-        }
-    }
-}
-
-JSBool
-Worker::jsPostMessageToParent(JSContext *cx, unsigned argc, jsval *vp)
-{
-    jsval workerval = js::GetFunctionNativeReserved(JSVAL_TO_OBJECT(JS_CALLEE(cx, vp)), 0);
-    Worker *w = (Worker *) JSVAL_TO_PRIVATE(workerval);
-
-    {
-        JSAutoSuspendRequest suspend(cx);  // avoid nesting w->lock in a request
-        if (w->checkTermination())
-            return false;
-    }
-
-    jsval data = argc > 0 ? JS_ARGV(cx, vp)[0] : JSVAL_VOID;
-    Event *event = UpMessageEvent::create(cx, w, data);
-    if (!event)
-        return false;
-    if (!w->parent->post(event)) {
-        event->destroy(cx);
-        JS_ReportOutOfMemory(cx);
-        return false;
-    }
-    JS_SET_RVAL(cx, vp, JSVAL_VOID);
-    return true;
-}
-
-JSBool
-Worker::jsPostMessageToChild(JSContext *cx, unsigned argc, jsval *vp)
-{
-    JSObject *workerobj = JS_THIS_OBJECT(cx, vp);
-    if (!workerobj)
-        return false;
-    Worker *w = (Worker *) JS_GetInstancePrivate(cx, workerobj, &jsWorkerClass, JS_ARGV(cx, vp));
-    if (!w) {
-        if (!JS_IsExceptionPending(cx))
-            JS_ReportError(cx, "Worker was shut down");
-        return false;
-    }
-
-    jsval data = argc > 0 ? JS_ARGV(cx, vp)[0] : JSVAL_VOID;
-    Event *event = DownMessageEvent::create(cx, w, data);
-    if (!event)
-        return false;
-    if (!w->post(event)) {
-        JS_ReportOutOfMemory(cx);
-        return false;
-    }
-    JS_SET_RVAL(cx, vp, JSVAL_VOID);
-    return true;
-}
-
-JSBool
-Worker::jsTerminate(JSContext *cx, unsigned argc, jsval *vp)
-{
-    JS_SET_RVAL(cx, vp, JSVAL_VOID);
-
-    JSObject *workerobj = JS_THIS_OBJECT(cx, vp);
-    if (!workerobj)
-        return false;
-    Worker *w = (Worker *) JS_GetInstancePrivate(cx, workerobj, &jsWorkerClass, JS_ARGV(cx, vp));
-    if (!w)
-        return !JS_IsExceptionPending(cx);  // ok to terminate twice
-
-    JSAutoSuspendRequest suspend(cx);
-    w->setTerminateFlag();
-    return true;
-}
-
-void
-Event::trace(JSTracer *trc)
-{
-    if (recipient)
-        recipient->trace(trc);
-    if (child)
-        JS_CALL_OBJECT_TRACER(trc, child->asObject(), "worker");
-}
-
-JSClass ThreadPool::jsClass = {
-    "ThreadPool", JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS,
-    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
-    JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, jsFinalize,
-    NULL, NULL, NULL, NULL, jsTraceThreadPool
-};
-
-JSClass Worker::jsWorkerClass = {
-    "Worker", JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS,
-    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
-    JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, jsFinalize,
-    NULL, NULL, NULL, NULL, jsTraceWorker
-};
-
-JSFunctionSpec Worker::jsMethods[3] = {
-    JS_FN("postMessage", Worker::jsPostMessageToChild, 1, 0),
-    JS_FN("terminate", Worker::jsTerminate, 0, 0),
-    JS_FS_END
-};
-
-ThreadPool *
-js::workers::init(JSContext *cx, WorkerHooks *hooks, JSObject *global, JSObject **rootp)
-{
-    return Worker::initWorkers(cx, hooks, global, rootp);
-}
-
-void
-js::workers::terminateAll(ThreadPool *tp)
-{
-    tp->terminateAll();
-}
-
-void
-js::workers::finish(JSContext *cx, ThreadPool *tp)
-{
-    if (MainQueue *mq = tp->getMainQueue()) {
-        JS_ALWAYS_TRUE(mq->mainThreadWork(cx, true));
-        tp->shutdown(cx);
-    }
-}
-
-#endif /* JS_THREADSAFE */
diff --git a/js/src/shell/jsworkers.h b/js/src/shell/jsworkers.h
deleted file mode 100644
index cbb2a734e92..00000000000
--- a/js/src/shell/jsworkers.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef jsworkers_h___
-#define jsworkers_h___
-
-#ifdef JS_THREADSAFE
-
-#include "jsapi.h"
-
-/*
- * Workers for the JS shell.
- *
- * Note: The real implementation of DOM Workers is in dom/workers.
- */
-namespace js {
-    namespace workers {
-        class ThreadPool;
-
-        class WorkerHooks {
-        public:
-            virtual JSObject *newGlobalObject(JSContext *cx) = 0;
-            virtual ~WorkerHooks() {}
-        };
-
-        /*
-         * Initialize workers. This defines the Worker constructor on global.
-         * Requires request. rootp must point to a GC root.
-         *
-         * On success, *rootp receives a pointer to an object, and init returns
-         * a non-null value. The caller must keep the object rooted and must
-         * pass it to js::workers::finish later.
-         */
-        ThreadPool *init(JSContext *cx, WorkerHooks *hooks, JSObject *global, JSObject **rootp);
-
-        /* Asynchronously signal for all workers to terminate.
-         *
-         * Call this before calling finish() to shut down without waiting for
-         * all messages to be proceesed.
-         */
-        void terminateAll(ThreadPool *tp);
-
-	/*
-	 * Finish running any workers, shut down the thread pool, and free all
-	 * resources associated with workers. The application must call this
-	 * before shutting down the runtime, and not during GC.
-	 *
-	 * Requires request.
-	 */
-	void finish(JSContext *cx, ThreadPool *tp);
-    }
-}
-
-#endif /* JS_THREADSAFE */
-
-#endif /* jsworkers_h___ */
diff --git a/js/src/tests/browser.js b/js/src/tests/browser.js
index 6443f5116aa..9b1eafdd1af 100644
--- a/js/src/tests/browser.js
+++ b/js/src/tests/browser.js
@@ -401,17 +401,6 @@ function outputscripttag(src, properties, e4x)
   document.write(s);
 }
 
-var JSTest = {
-  waitForExplicitFinish: function () {
-    gDelayTestDriverEnd = true;
-  },
-
-  testFinished: function () {
-    gDelayTestDriverEnd = false;
-    jsTestDriverEnd();
-  }
-};
-
 function jsTestDriverEnd()
 {
   // gDelayTestDriverEnd is used to
diff --git a/js/src/tests/js1_8_5/extensions/worker-error-child.js b/js/src/tests/js1_8_5/extensions/worker-error-child.js
deleted file mode 100644
index f59dfb9bb7b..00000000000
--- a/js/src/tests/js1_8_5/extensions/worker-error-child.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// |reftest| skip
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/
- * Contributor: Jason Orendorff <jorendorff@mozilla.com>
- */
-function onmessage(event) {
-    throw new Error("fail");
-}
diff --git a/js/src/tests/js1_8_5/extensions/worker-error-propagation-child.js b/js/src/tests/js1_8_5/extensions/worker-error-propagation-child.js
deleted file mode 100644
index 68929a231fe..00000000000
--- a/js/src/tests/js1_8_5/extensions/worker-error-propagation-child.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// |reftest| skip
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/
- * Contributor: Jason Orendorff <jorendorff@mozilla.com>
- */
-
-function onmessage(event) {
-    var n = +event.data;
-    if (n == 0)
-        throw new Error("boom");
-    var w = new Worker(workerDir + "worker-error-propagation-child.js");
-    w.onmessage = function (event) { postMessage(event.data); };
-    // No w.onerror here. We are testing error propagation when it is absent.
-    w.postMessage(n - 1 + "");
-}
diff --git a/js/src/tests/js1_8_5/extensions/worker-error-propagation.js b/js/src/tests/js1_8_5/extensions/worker-error-propagation.js
deleted file mode 100644
index 18c0fe26e10..00000000000
--- a/js/src/tests/js1_8_5/extensions/worker-error-propagation.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// |reftest| skip-if(!xulRuntime.shell)
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/
- * Contributor: Jason Orendorff <jorendorff@mozilla.com>
- */
-
-if (typeof Worker != 'undefined') {
-    JSTest.waitForExplicitFinish();
-    var w = Worker(workerDir + "worker-error-propagation-child.js");
-    var errors = 0;
-    w.onmessage = function () { throw new Error("no reply expected"); };
-    w.onerror = function (event) {
-        reportCompare("string", typeof event.message, "typeof event.message");
-        JSTest.testFinished();
-    };
-    w.postMessage("5");
-} else {
-    reportCompare(0, 0, " PASSED! Test skipped. Shell workers required.");
-}
diff --git a/js/src/tests/js1_8_5/extensions/worker-error.js b/js/src/tests/js1_8_5/extensions/worker-error.js
deleted file mode 100644
index 41e0cae86f1..00000000000
--- a/js/src/tests/js1_8_5/extensions/worker-error.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// |reftest| skip-if(!xulRuntime.shell) -- these tests sometimes hang in browser, bug 559954, bug 562333
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/
- * Contributor: Jason Orendorff <jorendorff@mozilla.com>
- */
-
-if (typeof Worker != 'undefined') {
-    JSTest.waitForExplicitFinish();
-
-    // The script throws new Error("fail") on first message.
-    var w = Worker(workerDir + "worker-error-child.js");
-    var a = [];
-    w.onerror = function (event) {
-        reportCompare("fail", event.message, "worker-error");
-        JSTest.testFinished();
-    };
-    w.postMessage("hello");
-} else {
-    reportCompare(0, 0, "Test skipped. Shell workers required.");
-}
diff --git a/js/src/tests/js1_8_5/extensions/worker-fib-child.js b/js/src/tests/js1_8_5/extensions/worker-fib-child.js
deleted file mode 100644
index f06ddeb0187..00000000000
--- a/js/src/tests/js1_8_5/extensions/worker-fib-child.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// |reftest| skip
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/
- * Contributor: Jason Orendorff <jorendorff@mozilla.com>
- */
-
-function onmessage(event) {
-    var a = event.data.split(/\t/);
-    var n = Number(a[0]);
-    var workerDir = a[1];
-
-    if (n <= 1) {
-        postMessage("" + n);
-    } else {
-        var w1 = new Worker(workerDir + "worker-fib-child.js"),
-            w2 = new Worker(workerDir + "worker-fib-child.js");
-        var a = [];
-        w1.onmessage = w2.onmessage = function(event) {
-            a.push(+event.data);
-            if (a.length == 2)
-                postMessage(a[0] + a[1] + "");
-        };
-        w1.postMessage(n - 1 + "\t" + workerDir);
-        w2.postMessage(n - 2 + "\t" + workerDir);
-    }
-}
diff --git a/js/src/tests/js1_8_5/extensions/worker-fib.js b/js/src/tests/js1_8_5/extensions/worker-fib.js
deleted file mode 100644
index e459c665689..00000000000
--- a/js/src/tests/js1_8_5/extensions/worker-fib.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// |reftest| skip-if(!xulRuntime.shell)
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/
- * Contributor: Jason Orendorff <jorendorff@mozilla.com>
- */
-
-if (typeof Worker != 'undefined') {
-    JSTest.waitForExplicitFinish();
-    var w = Worker(workerDir + "worker-fib-child.js");
-    w.onmessage = function (event) {
-        reportCompare("21", event.data, "worker-fib");
-        JSTest.testFinished();
-    };
-    w.postMessage("8\t" + workerDir); // 0 1 1 2 3 5 8 13 21
-} else {
-    reportCompare(0, 0, "Test skipped. Shell workers required.");
-}
diff --git a/js/src/tests/js1_8_5/extensions/worker-init-child.js b/js/src/tests/js1_8_5/extensions/worker-init-child.js
deleted file mode 100644
index 9e652451633..00000000000
--- a/js/src/tests/js1_8_5/extensions/worker-init-child.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// |reftest| skip
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/
- * Contributor: Jason Orendorff <jorendorff@mozilla.com>
- */
-postMessage('do your worst');
-for (;;) ;
diff --git a/js/src/tests/js1_8_5/extensions/worker-init.js b/js/src/tests/js1_8_5/extensions/worker-init.js
deleted file mode 100644
index fad57d48d06..00000000000
--- a/js/src/tests/js1_8_5/extensions/worker-init.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// |reftest| skip-if(!xulRuntime.shell)
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/
- * Contributor: Jason Orendorff <jorendorff@mozilla.com>
- */
-
-if (typeof Worker != 'undefined') {
-    JSTest.waitForExplicitFinish();
-    // Messages sent during initialization are a corner case, but in any case
-    // they should be delivered (no waiting until initialization is complete).
-    var w = new Worker(workerDir + "worker-init-child.js"); // posts a message, then loops forever
-    w.onmessage = function (event) {
-        reportCompare(0, 0, "worker-init");
-        JSTest.testFinished();
-    };
-} else {
-    reportCompare(0, 0, "Test skipped. Shell workers required.");
-}
diff --git a/js/src/tests/js1_8_5/extensions/worker-simple-child.js b/js/src/tests/js1_8_5/extensions/worker-simple-child.js
deleted file mode 100644
index 3835838eee6..00000000000
--- a/js/src/tests/js1_8_5/extensions/worker-simple-child.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// |reftest| skip
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/
- * Contributor: Jason Orendorff <jorendorff@mozilla.com>
- */
-
-onmessage = function (event) { postMessage(event.data); };
diff --git a/js/src/tests/js1_8_5/extensions/worker-simple.js b/js/src/tests/js1_8_5/extensions/worker-simple.js
deleted file mode 100644
index f05f64cedd9..00000000000
--- a/js/src/tests/js1_8_5/extensions/worker-simple.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// |reftest| skip-if(!xulRuntime.shell)
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/
- * Contributor: Jason Orendorff <jorendorff@mozilla.com>
- */
-
-if (typeof Worker != 'undefined') {
-    JSTest.waitForExplicitFinish();
-    var w = new Worker(workerDir + "worker-simple-child.js");
-    var a = [];
-    w.onmessage = function (event) {
-        a.push(event.data);
-        reportCompare(0, 0, "worker-simple");
-        JSTest.testFinished();
-    };
-    w.postMessage("hello");
-} else {
-    reportCompare(0, 0, "Test skipped. Shell workers required.");
-}
diff --git a/js/src/tests/js1_8_5/extensions/worker-terminate-child.js b/js/src/tests/js1_8_5/extensions/worker-terminate-child.js
deleted file mode 100644
index d388a123698..00000000000
--- a/js/src/tests/js1_8_5/extensions/worker-terminate-child.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// |reftest| skip
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/
- * Contributor: Jason Orendorff <jorendorff@mozilla.com>
- */
-
-onmessage = function (event) {
-    var workerDir = event.message;
-    var child = new Worker(workerDir + 'worker-terminate-iloop.js'); // loops forever
-    child.terminate();
-    postMessage("killed");
-};
diff --git a/js/src/tests/js1_8_5/extensions/worker-terminate-iloop.js b/js/src/tests/js1_8_5/extensions/worker-terminate-iloop.js
deleted file mode 100644
index 9d40bfde206..00000000000
--- a/js/src/tests/js1_8_5/extensions/worker-terminate-iloop.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// |reftest| skip
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/
- * Contributor: Jason Orendorff <jorendorff@mozilla.com>
- */
-
-for (;;)
-    ;
diff --git a/js/src/tests/js1_8_5/extensions/worker-terminate.js b/js/src/tests/js1_8_5/extensions/worker-terminate.js
deleted file mode 100644
index 7bd295eeea9..00000000000
--- a/js/src/tests/js1_8_5/extensions/worker-terminate.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// |reftest| skip-if(!xulRuntime.shell)
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/
- * Contributor: Jason Orendorff <jorendorff@mozilla.com>
- */
-
-if (typeof Worker != 'undefined') {
-    JSTest.waitForExplicitFinish();
-
-    // This tests that a parent worker can terminate a child.  We run the test
-    // several times serially. If terminate() doesn't work, the runaway Workers
-    // will soon outnumber the number of threads in the thread pool, and we
-    // will deadlock.
-    var i = 0;
-
-    function next() {
-        if (++i == 10) {
-            reportCompare(0, 0, "worker-terminate");
-            JSTest.testFinished();
-            return;
-        }
-
-        var w = new Worker(workerDir + "worker-terminate-child.js");
-        w.onmessage = function (event) {
-            reportCompare("killed", event.data, "killed runaway worker #" + i);
-            next();
-        };
-        w.onerror = function (event) {
-            reportCompare(0, 1, "Got error: " + event.message);
-        };
-        w.postMessage(workerDir);
-    }
-    next();
-} else {
-    reportCompare(0, 0, "Test skipped. Shell workers required.");
-}
diff --git a/js/src/tests/js1_8_5/extensions/worker-timeout-child.js b/js/src/tests/js1_8_5/extensions/worker-timeout-child.js
deleted file mode 100644
index fb96d1da4db..00000000000
--- a/js/src/tests/js1_8_5/extensions/worker-timeout-child.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// |reftest| skip
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/
- * Contributor: Jason Orendorff
- */
-
-for (;;)
-    ;
diff --git a/js/src/tests/js1_8_5/extensions/worker-timeout.js b/js/src/tests/js1_8_5/extensions/worker-timeout.js
deleted file mode 100644
index 628edf00156..00000000000
--- a/js/src/tests/js1_8_5/extensions/worker-timeout.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// |reftest| skip-if(!xulRuntime.shell||Android)
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/
- * Contributor: Jason Orendorff
- */
-
-if (typeof timeout == 'function' && typeof Worker != 'undefined') {
-    // We don't actually ever call JSTest.testFinished(); instead we
-    // time out and exit the shell with exit code 6.
-    JSTest.waitForExplicitFinish();
-    expectExitCode(6);
-    timeout(1.0);
-    for (var i = 0; i < 5; i++)
-        new Worker(workerDir + "worker-timeout-child.js"); // just loops forever
-} else {
-    reportCompare(0, 0, "Test skipped. Shell workers and timeout required.");
-}
diff --git a/js/src/tests/shell.js b/js/src/tests/shell.js
index 31daba2746e..3be41836430 100644
--- a/js/src/tests/shell.js
+++ b/js/src/tests/shell.js
@@ -797,18 +797,6 @@ function getFailedCases() {
   }
 }
 
-var JSTest = {
-  waitForExplicitFinish: function () {
-    gDelayTestDriverEnd = true;
-  },
-
-  testFinished: function () {
-    gDelayTestDriverEnd = false;
-    jsTestDriverEnd();
-    quit();
-  }
-};
-
 function jsTestDriverEnd()
 {
   // gDelayTestDriverEnd is used to