Backed out changeset fb43bd87db39 (bug 883495) for mass carnage of a CLOSED TREE.

netwerk/dns/nsDNSService2.cpp

@@ -255,7 +255,7 @@ public:
                       uint16_t          af)
         : mResolver(res)
         , mHost(host)
-        , mListener(new nsMainThreadPtrHolder<nsIDNSListener>(listener))
+        , mListener(listener)
         , mFlags(flags)
         , mAF(af) {}
     ~nsDNSAsyncRequest() {}
@@ -268,7 +268,7 @@ public:
 
     nsRefPtr<nsHostResolver> mResolver;
     nsCString                mHost; // hostname we're resolving
-    nsMainThreadPtrHandle<nsIDNSListener> mListener;
+    nsCOMPtr<nsIDNSListener> mListener;
     uint16_t                 mFlags;
     uint16_t                 mAF;
 };
@@ -292,6 +292,7 @@ nsDNSAsyncRequest::OnLookupComplete(nsHostResolver *resolver,
     MOZ_EVENT_TRACER_DONE(this, "net::dns::lookup");
 
     mListener->OnLookupComplete(this, rec, status);
+    mListener = nullptr;
 
     // release the reference to ourselves that was added before we were
     // handed off to the host resolver.