Necko cleanup.

content/base/src/nsDocument.h

@@ -438,11 +438,7 @@ protected:
   nsIArena* mArena;
   nsString* mDocumentTitle;
   nsIURI* mDocumentURL;
-#ifdef NECKO
   nsILoadGroup* mDocumentLoadGroup;
-#else
-  nsILoadGroup* mDocumentLoadGroup;
-#endif
   nsString mCharacterSet;
   nsIDocument* mParentDocument;
   nsVoidArray mSubDocuments;

layout/base/src/nsDocument.h

@@ -438,11 +438,7 @@ protected:
   nsIArena* mArena;
   nsString* mDocumentTitle;
   nsIURI* mDocumentURL;
-#ifdef NECKO
   nsILoadGroup* mDocumentLoadGroup;
-#else
-  nsILoadGroup* mDocumentLoadGroup;
-#endif
   nsString mCharacterSet;
   nsIDocument* mParentDocument;
   nsVoidArray mSubDocuments;

uriloader/base/nsDocLoader.cpp

@@ -1595,28 +1595,7 @@ nsresult nsDocumentBindInfo::Bind(nsIURI* aURL, nsIStreamListener* aListener)
     nsServiceManager::ReleaseService(kNetServiceCID, inet);
   }
 #else
-  NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv);
-  if (NS_FAILED(rv)) return rv;
-
-  nsIURI *uri = nsnull;
-  rv = m_Url->QueryInterface(nsIURI::GetIID(), (void**)&uri);
-  if (NS_FAILED(rv)) return rv;
-  
-  nsIChannel *channel = nsnull;
-  // XXX NECKO verb? sinkGetter?
-  rv = service->NewChannelFromURI("load", uri, nsnull, &channel);
-  NS_RELEASE(uri);
-  if (NS_FAILED(rv)) return rv;
-
-  nsIEventQueue *eventQ = nsnull;
-  NS_WITH_SERVICE(nsIEventQueueService, eqService, kEventQueueServiceCID, &rv);
-  if (NS_FAILED(rv)) return rv;
-
-  rv = eqService->GetThreadEventQueue(PR_CurrentThread(), &eventQ);
-  if (NS_FAILED(rv)) return rv;
-
-  rv = channel->AsyncRead(0, -1, nsnull, eventQ, this);
-  NS_RELEASE(eventQ);
+  rv = NS_OpenURI(this, m_Url);
 #endif // NECKO
 
   return rv;

webshell/src/nsDocLoader.cpp

@@ -1595,28 +1595,7 @@ nsresult nsDocumentBindInfo::Bind(nsIURI* aURL, nsIStreamListener* aListener)
     nsServiceManager::ReleaseService(kNetServiceCID, inet);
   }
 #else
-  NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv);
-  if (NS_FAILED(rv)) return rv;
-
-  nsIURI *uri = nsnull;
-  rv = m_Url->QueryInterface(nsIURI::GetIID(), (void**)&uri);
-  if (NS_FAILED(rv)) return rv;
-  
-  nsIChannel *channel = nsnull;
-  // XXX NECKO verb? sinkGetter?
-  rv = service->NewChannelFromURI("load", uri, nsnull, &channel);
-  NS_RELEASE(uri);
-  if (NS_FAILED(rv)) return rv;
-
-  nsIEventQueue *eventQ = nsnull;
-  NS_WITH_SERVICE(nsIEventQueueService, eqService, kEventQueueServiceCID, &rv);
-  if (NS_FAILED(rv)) return rv;
-
-  rv = eqService->GetThreadEventQueue(PR_CurrentThread(), &eventQ);
-  if (NS_FAILED(rv)) return rv;
-
-  rv = channel->AsyncRead(0, -1, nsnull, eventQ, this);
-  NS_RELEASE(eventQ);
+  rv = NS_OpenURI(this, m_Url);
 #endif // NECKO
 
   return rv;