landing missing changes for bug 287648

directory/xpcom/base/src/nsLDAPConnection.cpp

@@ -52,6 +52,7 @@
 #include "nsIEventQueueService.h"
 #include "nsIConsoleService.h"
 #include "nsIDNSService.h"
+#include "nsIDNSRecord.h"
 #include "nsIRequestObserver.h"
 #include "nsIProxyObjectManager.h"
 #include "nsEventQueueUtils.h"
@@ -277,7 +278,7 @@ nsLDAPConnection::Close()
   // Init listener (if still there).
   //
   if (mDNSRequest) {
-      mDNSRequest->Cancel();
+      mDNSRequest->Cancel(NS_ERROR_ABORT);
       mDNSRequest = 0;
   }
   mInitListener = 0;
@@ -861,7 +862,7 @@ nsLDAPConnectionLoop::Run(void)
 }
 
 NS_IMETHODIMP
-nsLDAPConnection::OnLookupComplete(nsIDNSRequest *aRequest,
+nsLDAPConnection::OnLookupComplete(nsICancelable *aRequest,
                                    nsIDNSRecord  *aRecord,
                                    nsresult       aStatus)
 {    

directory/xpcom/base/src/nsLDAPConnection.h

@@ -52,7 +52,8 @@
 #include "nspr.h"
 #include "nsWeakReference.h"
 #include "nsWeakPtr.h"
-#include "nsIDNSService.h"
+#include "nsIDNSListener.h"
+#include "nsICancelable.h"
 #include "nsIRequest.h"
 
 // 0d871e30-1dd2-11b2-8ea9-831778c78e93
@@ -131,7 +132,7 @@ class nsLDAPConnection : public nsILDAPConnection,
 
     nsCString mResolvedIP;              // Preresolved list of host IPs
     nsCOMPtr<nsILDAPMessageListener> mInitListener; // Init callback
-    nsCOMPtr<nsIDNSRequest> mDNSRequest;   // The "active" DNS request
+    nsCOMPtr<nsICancelable> mDNSRequest;   // The "active" DNS request
     nsCString               mDNSHost;   // The hostname being resolved
     nsCOMPtr<nsISupports> mClosure;     // private parameter (anything caller desires)
 };