Backed out changeset 4cfe953fecdb (bug 1675491) for causing NetworkDa…

…taCount crashes. CLOSED TREE
dothq · Nov 9, 2020 · a9fe7c0 · a9fe7c0
1 parent a2ece00
commit a9fe7c0
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 180 deletions.
diff --git a/netwerk/base/NetworkDataCountLayer.cpp b/netwerk/base/NetworkDataCountLayer.cpp
diff --git a/netwerk/base/NetworkDataCountLayer.h b/netwerk/base/NetworkDataCountLayer.h
diff --git a/netwerk/base/moz.build b/netwerk/base/moz.build
@@ -188,7 +188,6 @@ UNIFIED_SOURCES += [
     "LoadInfo.cpp",
     "MemoryDownloader.cpp",
     "NetworkConnectivityService.cpp",
-    "NetworkDataCountLayer.cpp",
     "nsAsyncRedirectVerifyHelper.cpp",
     "nsAsyncStreamCopier.cpp",
     "nsAuthInformationHolder.cpp",

diff --git a/netwerk/base/nsSocketTransport2.cpp b/netwerk/base/nsSocketTransport2.cpp
@@ -34,7 +34,6 @@
 #include "nsIDNSRecord.h"
 #include "nsIDNSByTypeRecord.h"
 #include "nsICancelable.h"
-#include "NetworkDataCountLayer.h"
 #include "QuicSocketControl.h"
 #include "TCPFastOpenLayer.h"
 #include <algorithm>
@@ -1613,15 +1612,6 @@ nsresult nsSocketTransport::InitiateSocket() {
     }
   }
 
-  if (Telemetry::CanRecordPrereleaseData()) {
-    if (NS_FAILED(AttachNetworkDataCountLayer(fd))) {
-      SOCKET_LOG(
-            ("nsSocketTransport::InitiateSocket "
-             "AttachNetworkDataCountLayer failed [this=%p]\n",
-             this));
-    }
-  }
-
   bool connectCalled = true;  // This is only needed for telemetry.
   status = PR_Connect(fd, &prAddr, NS_SOCKET_CONNECT_TIMEOUT);
   PRErrorCode code = PR_GetError();