diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn
index d1e1f17899bb..a5ff8e7a8be8 100644
--- a/devtools/client/jar.mn
+++ b/devtools/client/jar.mn
@@ -303,7 +303,6 @@ devtools.jar:
content/netmonitor/src/assets/styles/Toolbar.css (netmonitor/src/assets/styles/Toolbar.css)
content/netmonitor/src/assets/styles/variables.css (netmonitor/src/assets/styles/variables.css)
content/netmonitor/src/assets/icons/play.svg (netmonitor/src/assets/icons/play.svg)
- content/netmonitor/src/assets/icons/shield.svg (netmonitor/src/assets/icons/shield.svg)
content/netmonitor/index.html (netmonitor/index.html)
# Application panel
diff --git a/devtools/client/locales/en-US/netmonitor.properties b/devtools/client/locales/en-US/netmonitor.properties
index 09572cafb215..a68014c2a532 100644
--- a/devtools/client/locales/en-US/netmonitor.properties
+++ b/devtools/client/locales/en-US/netmonitor.properties
@@ -868,10 +868,6 @@ netmonitor.security.connection=Connection:
# in the security tab describing the server certificate section.
netmonitor.security.certificate=Certificate:
-# LOCALIZATION NOTE (netmonitor.trackingResource.tooltip): This is the label used
-# in the Network monitor panel as a tooltip for tracking resource icon.
-netmonitor.trackingResource.tooltip=This URL matches a known tracker and it would be blocked with Content Blocking enabled.
-
# LOCALIZATION NOTE (netmonitor.context.copy): This is the label displayed
# for the copy sub-menu in the context menu for a request
netmonitor.context.copy=Copy
diff --git a/devtools/client/netmonitor/src/assets/icons/shield.svg b/devtools/client/netmonitor/src/assets/icons/shield.svg
deleted file mode 100644
index dd5bf9522cdc..000000000000
--- a/devtools/client/netmonitor/src/assets/icons/shield.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/devtools/client/netmonitor/src/assets/styles/RequestList.css b/devtools/client/netmonitor/src/assets/styles/RequestList.css
index 55eeeb286cf3..fb154720e17b 100644
--- a/devtools/client/netmonitor/src/assets/styles/RequestList.css
+++ b/devtools/client/netmonitor/src/assets/styles/RequestList.css
@@ -386,16 +386,6 @@
background-image: url(chrome://devtools/skin/images/globe.svg);
}
-.tracking-resource {
- display: inline-block;
- width: 16px;
- height: 16px;
- margin: 0 3px 0 -3px;
- vertical-align: text-bottom;
- background-image: url(chrome://devtools/content/netmonitor/src/assets/icons/shield.svg);
- background-repeat: no-repeat;
-}
-
/* RemoteIP column */
.requests-list-remoteip {
diff --git a/devtools/client/netmonitor/src/components/RequestListColumnDomain.js b/devtools/client/netmonitor/src/components/RequestListColumnDomain.js
index c4d420686f56..c96796837e3f 100644
--- a/devtools/client/netmonitor/src/components/RequestListColumnDomain.js
+++ b/devtools/client/netmonitor/src/components/RequestListColumnDomain.js
@@ -55,10 +55,6 @@ class RequestListColumnDomain extends Component {
onMouseDown: onSecurityIconMouseDown,
title: iconTitle,
}),
- item.isTrackingResource && div({
- className: "tracking-resource",
- title: L10N.getStr("netmonitor.trackingResource.tooltip"),
- }),
host,
)
);
diff --git a/devtools/client/netmonitor/src/connector/firefox-data-provider.js b/devtools/client/netmonitor/src/connector/firefox-data-provider.js
index 5a8fe292fad5..96e615fd4799 100644
--- a/devtools/client/netmonitor/src/connector/firefox-data-provider.js
+++ b/devtools/client/netmonitor/src/connector/firefox-data-provider.js
@@ -71,7 +71,6 @@ class FirefoxDataProvider {
startedDateTime,
fromCache,
fromServiceWorker,
- isTrackingResource,
} = data;
if (this.actionsEnabled && this.actions.addRequest) {
@@ -90,7 +89,6 @@ class FirefoxDataProvider {
fromCache,
fromServiceWorker,
- isTrackingResource,
}, true);
}
@@ -325,7 +323,6 @@ class FirefoxDataProvider {
url,
},
startedDateTime,
- isTrackingResource,
} = networkInfo;
await this.addRequest(actor, {
@@ -336,7 +333,6 @@ class FirefoxDataProvider {
method,
startedDateTime,
url,
- isTrackingResource,
});
this.emit(EVENTS.NETWORK_EVENT, actor);
@@ -355,9 +351,7 @@ class FirefoxDataProvider {
switch (updateType) {
case "securityInfo":
- this.pushRequestToQueue(actor, {
- securityState: networkInfo.securityState
- });
+ this.pushRequestToQueue(actor, { securityState: networkInfo.securityState });
break;
case "responseStart":
this.pushRequestToQueue(actor, {
diff --git a/devtools/client/netmonitor/src/constants.js b/devtools/client/netmonitor/src/constants.js
index 147f15d27124..54772fea700d 100644
--- a/devtools/client/netmonitor/src/constants.js
+++ b/devtools/client/netmonitor/src/constants.js
@@ -146,7 +146,6 @@ const UPDATE_PROPS = [
"responseCacheAvailable",
"formDataSections",
"stacktrace",
- "isTrackingResource",
];
const PANELS = {
diff --git a/devtools/client/netmonitor/test/browser.ini b/devtools/client/netmonitor/test/browser.ini
index ad2f8abf9b55..d68027aa5d6d 100644
--- a/devtools/client/netmonitor/test/browser.ini
+++ b/devtools/client/netmonitor/test/browser.ini
@@ -37,7 +37,6 @@ support-files =
html_sorting-test-page.html
html_statistics-test-page.html
html_status-codes-test-page.html
- html_tracking-protection.html
html_api-calls-test-page.html
html_copy-as-curl.html
html_curl-utils.html
@@ -195,7 +194,6 @@ skip-if = true # Bug 1373558
[browser_net_timeline_ticks.js]
skip-if = true # TODO: fix the test
[browser_net_timing-division.js]
-[browser_net_tracking-resources.js]
[browser_net_truncate.js]
[browser_net_view-source-debugger.js]
[browser_net_waterfall-click.js]
diff --git a/devtools/client/netmonitor/test/browser_net_tracking-resources.js b/devtools/client/netmonitor/test/browser_net_tracking-resources.js
deleted file mode 100644
index b7fc2d6ffcf7..000000000000
--- a/devtools/client/netmonitor/test/browser_net_tracking-resources.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-const { UrlClassifierTestUtils } =
- ChromeUtils.import("resource://testing-common/UrlClassifierTestUtils.jsm", {});
-
-const TEST_URI = "http://tracking.example.org/browser/devtools/client/" +
- "netmonitor/test/html_tracking-protection.html";
-
-registerCleanupFunction(function() {
- UrlClassifierTestUtils.cleanupTestTrackers();
-});
-
-/**
- * Test that tracking resources are properly marked in the Network panel.
- */
-add_task(async function() {
- await UrlClassifierTestUtils.addTestTrackers();
-
- const { tab, monitor } = await initNetMonitor(TEST_URI);
- info("Starting test...");
-
- const { document, store, windowRequire } = monitor.panelWin;
- const Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
-
- store.dispatch(Actions.batchEnable(false));
-
- // Reload the page
- const wait = waitForAllRequestsFinished(monitor);
- tab.linkedBrowser.reload();
- await wait;
-
- const requests = document.querySelectorAll(".request-list-item .tracking-resource");
- is(requests.length, 1, "There should be one tracking request");
-
- await teardown(monitor);
-});
diff --git a/devtools/client/netmonitor/test/html_tracking-protection.html b/devtools/client/netmonitor/test/html_tracking-protection.html
deleted file mode 100644
index 17f0e459e3d1..000000000000
--- a/devtools/client/netmonitor/test/html_tracking-protection.html
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/devtools/server/actors/network-event.js b/devtools/server/actors/network-event.js
index deabd52d80e9..5109c8850325 100644
--- a/devtools/server/actors/network-event.js
+++ b/devtools/server/actors/network-event.js
@@ -65,7 +65,6 @@ const NetworkEventActor = protocol.ActorClassWithSpec(networkEventSpec, {
fromCache: this._fromCache,
fromServiceWorker: this._fromServiceWorker,
private: this._private,
- isTrackingResource: this._isTrackingResource,
};
},
@@ -104,7 +103,6 @@ const NetworkEventActor = protocol.ActorClassWithSpec(networkEventSpec, {
this._cause = networkEvent.cause;
this._fromCache = networkEvent.fromCache;
this._fromServiceWorker = networkEvent.fromServiceWorker;
- this._isTrackingResource = networkEvent.isTrackingResource;
this._channelId = networkEvent.channelId;
// Stack trace info isn't sent automatically. The client
diff --git a/devtools/server/actors/network-monitor/network-observer.js b/devtools/server/actors/network-monitor/network-observer.js
index 4df902d2603b..bc919c1e8389 100644
--- a/devtools/server/actors/network-monitor/network-observer.js
+++ b/devtools/server/actors/network-monitor/network-observer.js
@@ -313,7 +313,7 @@ NetworkObserver.prototype = {
this.openResponses.set(channel, response);
if (topic === "http-on-examine-cached-response") {
- // Service worker requests emits cached-response notification on non-e10s,
+ // Service worker requests emits cached-reponse notification on non-e10s,
// and we fake one on e10s.
const fromServiceWorker = this.interceptedChannels.has(channel);
this.interceptedChannels.delete(channel);
@@ -491,7 +491,6 @@ NetworkObserver.prototype = {
.toISOString();
event.fromCache = fromCache;
event.fromServiceWorker = fromServiceWorker;
- event.isTrackingResource = channel.isTrackingResource;
httpActivity.fromServiceWorker = fromServiceWorker;
if (extraStringData) {
diff --git a/devtools/shared/webconsole/client.js b/devtools/shared/webconsole/client.js
index 2bd2c929c15c..8584b7bb2fdb 100644
--- a/devtools/shared/webconsole/client.js
+++ b/devtools/shared/webconsole/client.js
@@ -110,8 +110,7 @@ WebConsoleClient.prototype = {
updates: [],
private: actor.private,
fromCache: actor.fromCache,
- fromServiceWorker: actor.fromServiceWorker,
- isTrackingResource: actor.isTrackingResource,
+ fromServiceWorker: actor.fromServiceWorker
};
this._networkRequests.set(actor.actor, networkInfo);