Bug 924967 - Add main thread assertions for Cancel in nsLoadGroup, nsHttpChannel and nsInputStreamPump r=mcmanus

netwerk/base/src/nsInputStreamPump.cpp

@@ -198,6 +198,8 @@ nsInputStreamPump::GetStatus(nsresult *status)
 NS_IMETHODIMP
 nsInputStreamPump::Cancel(nsresult status)
 {
+    MOZ_ASSERT(NS_IsMainThread());
+
     ReentrantMonitorAutoEnter mon(mMonitor);
 
     LOG(("nsInputStreamPump::Cancel [this=%p status=%x]\n",

netwerk/base/src/nsLoadGroup.cpp

@@ -22,6 +22,7 @@
 #include "nsIInterfaceRequestor.h"
 #include "nsIRequestObserver.h"
 #include "CacheObserver.h"
+#include "MainThreadUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::net;
@@ -224,6 +225,8 @@ AppendRequestsToArray(PLDHashTable *table, PLDHashEntryHdr *hdr,
 NS_IMETHODIMP
 nsLoadGroup::Cancel(nsresult status)
 {
+    MOZ_ASSERT(NS_IsMainThread());
+
     NS_ASSERTION(NS_FAILED(status), "shouldn't cancel with a success code");
     nsresult rv;
     uint32_t count = mRequests.entryCount;

netwerk/protocol/http/HttpChannelChild.cpp

@@ -917,6 +917,8 @@ HttpChannelChild::OnRedirectVerifyCallback(nsresult result)
 NS_IMETHODIMP
 HttpChannelChild::Cancel(nsresult status)
 {
+  MOZ_ASSERT(NS_IsMainThread());
+
   if (!mCanceled) {
     // If this cancel occurs before nsHttpChannel has been set up, AsyncOpen
     // is responsible for cleaning up.

netwerk/protocol/http/nsHttpChannel.cpp

@@ -4308,6 +4308,8 @@ NS_INTERFACE_MAP_END_INHERITING(HttpBaseChannel)
 NS_IMETHODIMP
 nsHttpChannel::Cancel(nsresult status)
 {
+    MOZ_ASSERT(NS_IsMainThread());
+
     LOG(("nsHttpChannel::Cancel [this=%p status=%x]\n", this, status));
     if (mCanceled) {
         LOG(("  ignoring; already canceled\n"));