$OpenBSD$

index f2a64ac..6f95d97 100644
--- netwerk/base/src/nsPACMan.h.orig	Fri Feb 20 15:40:37 2015
+++ netwerk/base/src/nsPACMan.h	Fri Feb 20 15:40:37 2015
@@ -24,15 +24,16 @@
 class nsPACMan;
 class nsISystemProxySettings;
 class nsIThread;
+class WaitForThreadShutdown;
 
 /**
- * This class defines a callback interface used by AsyncGetProxyForURI.
+ * This class defines a callback interface used by AsyncGetProxyForChannel.
  */
 class NS_NO_VTABLE nsPACManCallback : public nsISupports
 {
 public:
   /**
-   * This method is invoked on the same thread that called AsyncGetProxyForURI.
+   * This method is invoked on the same thread that called AsyncGetProxyForChannel.
    *
    * @param status
    *        This parameter indicates whether or not the PAC query succeeded.
@@ -100,14 +101,14 @@ public:
    * will queue up the request, and complete it once the PAC file has been
    * loaded.
    * 
-   * @param uri
-   *        The URI to query.
+   * @param channel
+   *        The channel to query.
    * @param callback
    *        The callback to run once the PAC result is available.
    * @param mustCallbackOnMainThread
    *        If set to false the callback can be made from the PAC thread
    */
-  nsresult AsyncGetProxyForURI(nsIURI *uri, nsPACManCallback *callback,
+  nsresult AsyncGetProxyForChannel(nsIChannel *channel, nsPACManCallback *callback,
                                bool mustCallbackOnMainThread);
 
   /**
@@ -164,6 +165,7 @@ private:
   friend class PendingPACQuery;
   friend class PACLoadComplete;
   friend class ExecutePACThreadAction;
+  friend class WaitForThreadShutdown;
 
   ~nsPACMan();