Backed out changeset e81bf7852eb2 (bug 1288308)

iaxat · Nov 2, 2016 · 92f6fb2 · 92f6fb2
1 parent 5107a26
commit 92f6fb2
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 1,067 deletions.
diff --git a/netwerk/base/ShutdownLayer.cpp b/netwerk/base/ShutdownLayer.cpp
@@ -15,15 +15,6 @@ static PRDescIdentity sWinSockShutdownLayerIdentity;
 static PRIOMethods sWinSockShutdownLayerMethods;
 static PRIOMethods *sWinSockShutdownLayerMethodsPtr = nullptr;
 
-namespace mozilla {
-namespace net {
-
-extern PRDescIdentity nsNamedPipeLayerIdentity;
-
-} // namespace net
-} // namespace mozilla
-
-
 PRStatus
 WinSockClose(PRFileDesc *aFd)
 {
@@ -54,12 +45,6 @@ nsresult mozilla::net::AttachShutdownLayer(PRFileDesc *aFd)
     sWinSockShutdownLayerMethodsPtr = &sWinSockShutdownLayerMethods;
   }
 
-  if (PR_GetIdentitiesLayer(aFd, mozilla::net::nsNamedPipeLayerIdentity)) {
-    // Do not attach shutdown layer on named pipe layer,
-    // it is for PR_NSPR_IO_LAYER only.
-    return NS_OK;
-  }
-
   PRFileDesc * layer;
   PRStatus     status;
 

diff --git a/netwerk/socket/moz.build b/netwerk/socket/moz.build
@@ -14,10 +14,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_socket'
 
-LOCAL_INCLUDES += [
-    '/netwerk/base',
-]
-
 UNIFIED_SOURCES += [
     'nsSocketProviderService.cpp',
     'nsSOCKSIOLayer.cpp',
@@ -30,7 +26,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
         'nsINamedPipeService.idl',
     ]
     UNIFIED_SOURCES += [
-        'nsNamedPipeIOLayer.cpp',
         'nsNamedPipeService.cpp'
     ]