bug 664163 - Fix Get(Local|Remote)(Address|Port) in HttpChannelChild. r=jdm

netwerk/protocol/http/HttpChannelChild.cpp

@@ -291,6 +291,8 @@ HttpChannelChild::OnStartRequest(const nsHttpResponseHead& responseHead,
   mCacheEntryAvailable = cacheEntryAvailable;
   mCacheExpirationTime = cacheExpirationTime;
   mCachedCharset = cachedCharset;
+  mSelfAddr = selfAddr;
+  mPeerAddr = peerAddr;
 
   AutoEventEnqueuer ensureSerialDispatch(mEventQ);
 
@@ -313,9 +315,6 @@ HttpChannelChild::OnStartRequest(const nsHttpResponseHead& responseHead,
   rv = ApplyContentConversions();
   if (NS_FAILED(rv))
     Cancel(rv);
-
-  mSelfAddr = selfAddr;
-  mPeerAddr = peerAddr;
 }
 
 class TransportAndDataEvent : public ChannelEvent
@@ -1113,36 +1112,6 @@ HttpChannelChild::SetupFallbackChannel(const char *aFallbackKey)
   DROP_DEAD();
 }
 
-// The next four _should_ be implemented, but we need to figure out how
-// to transfer the data from the chrome process first.
-
-NS_IMETHODIMP
-HttpChannelChild::GetRemoteAddress(nsACString & _result)
-{
-  return NS_ERROR_NOT_AVAILABLE;
-}
-
-NS_IMETHODIMP
-HttpChannelChild::GetRemotePort(PRInt32 * _result)
-{
-  NS_ENSURE_ARG_POINTER(_result);
-  return NS_ERROR_NOT_AVAILABLE;
-}
-
-NS_IMETHODIMP
-HttpChannelChild::GetLocalAddress(nsACString & _result)
-{
-  return NS_ERROR_NOT_AVAILABLE;
-}
-
-NS_IMETHODIMP
-HttpChannelChild::GetLocalPort(PRInt32 * _result)
-{
-  NS_ENSURE_ARG_POINTER(_result);
-  return NS_ERROR_NOT_AVAILABLE;
-}
-
-
 //-----------------------------------------------------------------------------
 // HttpChannelChild::nsICacheInfoChannel
 //-----------------------------------------------------------------------------

netwerk/protocol/http/HttpChannelChild.h

@@ -106,10 +106,6 @@ public:
                               bool aMerge);
   // nsIHttpChannelInternal
   NS_IMETHOD SetupFallbackChannel(const char *aFallbackKey);
-  NS_IMETHOD GetLocalAddress(nsACString& addr);
-  NS_IMETHOD GetLocalPort(PRInt32* port);
-  NS_IMETHOD GetRemoteAddress(nsACString& addr);
-  NS_IMETHOD GetRemotePort(PRInt32* port);
   // nsISupportsPriority
   NS_IMETHOD SetPriority(PRInt32 value);
   // nsIResumableChannel

netwerk/test/unit/test_traceable_channel.js

@@ -22,14 +22,18 @@ TracingListener.prototype = {
 
     request.QueryInterface(Components.interfaces.nsIHttpChannelInternal);
 
-// local/remote addresses broken in e10s: disable for now
-/*
+    try {
       do_check_eq(request.localAddress, "127.0.0.1");
       do_check_eq(request.localPort > 0, true);
       do_check_neq(request.localPort, 4444);
       do_check_eq(request.remoteAddress, "127.0.0.1");
       do_check_eq(request.remotePort, 4444);
-*/
+    } catch(e) {
+      do_throw("failed to get local/remote socket info");
+    }
+
+    request.QueryInterface(Components.interfaces.nsISupportsPriority);
+    request.priority = Ci.nsISupportsPriority.PRIORITY_LOW;
 
     // Make sure listener can't be replaced after OnStartRequest was called.
     request.QueryInterface(Components.interfaces.nsITraceableChannel);
@@ -138,8 +142,10 @@ function channel_finished(request, input, ctx) {
   httpserver.stop(do_test_finished);
 }
 
-function run_test() {
+// needs to be global or it'll go out of scope before it observes request
 var observer = new HttpResponseExaminer();
+
+function run_test() {
   observer.register();
 
   httpserver = new nsHttpServer();