Backed out changeset cf9b81801abc (bug 1640117) for dt failures on browser_webconsole_trackingprotection_errors.js . CLOSED TREE

devtools/client/webconsole/test/browser/browser_webconsole_trackingprotection_errors.js

@@ -83,7 +83,7 @@ add_task(async function testForeignCookieBlockedMessage() {
   );
   await testLearnMoreClickOpenNewTab(
     message,
-    getStorageErrorUrl("BlockedCookieForeign")
+    getStorageErrorUrl("CookieBlockedForeign")
   );
   win.close();
 });
@@ -113,7 +113,7 @@ add_task(async function testLimitForeignCookieBlockedMessage() {
   info("Check that clicking on the Learn More link works as expected");
   await testLearnMoreClickOpenNewTab(
     message,
-    getStorageErrorUrl("BlockedCookieForeign")
+    getStorageErrorUrl("CookieBlockedForeign")
   );
   win.close();
 });
@@ -153,7 +153,7 @@ add_task(async function testTrackerCookieBlockedMessage() {
   );
   await testLearnMoreClickOpenNewTab(
     message,
-    getStorageErrorUrl("BlockedCookieTracker")
+    getStorageErrorUrl("CookieBlockedTracker")
   );
   win.close();
 });

devtools/server/actors/errordocs.js

@@ -156,9 +156,9 @@ const storageAccessPolicyParams =
   "?utm_source=devtools&utm_medium=firefox-cookie-errors&utm_campaign=default";
 const StorageAccessPolicyErrorDocs = {
   cookieBlockedPermission: "CookieBlockedByPermission",
-  cookieBlockedTracker: "BlockedCookieTracker",
+  cookieBlockedTracker: "CookieBlockedTracker",
   cookieBlockedAll: "CookieBlockedAll",
-  cookieBlockedForeign: "BlockedCookieForeign",
+  cookieBlockedForeign: "CookieBlockedForeign",
 };
 
 exports.GetURL = error => {

netwerk/locales/en-US/necko.properties

@@ -37,12 +37,12 @@ DirFileLabel=File:
 SuperfluousAuth=You are about to log in to the site “%1$S” with the username “%2$S”, but the website does not require authentication. This may be an attempt to trick you.\n\nIs “%1$S” the site you want to visit?
 AutomaticAuth=You are about to log in to the site “%1$S” with the username “%2$S”.
 
-BlockedCookieForeign=Request to access cookie or storage on “%1$S” was blocked because we are blocking all third-party storage access requests and enhanced tracking protection is enabled.
-BlockedCookieTracker=Request to access cookie or storage on “%1$S” was blocked because it came from a tracker and enhanced tracking protection is enabled.
-BlockedTrackerUri=The resource at “%1$S” was blocked because enhanced tracking protection is enabled.
+TrackerUriBlocked=The resource at “%1$S” was blocked because content blocking is enabled.
 UnsafeUriBlocked=The resource at “%1$S” was blocked by Safe Browsing.
 CookieBlockedByPermission=Request to access cookies or storage on “%1$S” was blocked because of custom cookie permission.
+CookieBlockedTracker=Request to access cookie or storage on “%1$S” was blocked because it came from a tracker and content blocking is enabled.
 CookieBlockedAll=Request to access cookie or storage on “%1$S” was blocked because we are blocking all storage access requests.
+CookieBlockedForeign=Request to access cookie or storage on “%1$S” was blocked because we are blocking all third-party storage access requests and content blocking is enabled.
 
 # LOCALIZATION NOTE (CookieAllowedForOriginByStorageAccessAPI): %2$S and %1$S are URLs.
 CookieAllowedForOriginByStorageAccessAPI=Storage access granted for origin “%2$S” on “%1$S”.

netwerk/url-classifier/UrlClassifierFeatureFactory.cpp

@@ -307,16 +307,16 @@ struct BlockingErrorCode {
 static const BlockingErrorCode sBlockingErrorCodes[] = {
     {NS_ERROR_TRACKING_URI,
      nsIWebProgressListener::STATE_BLOCKED_TRACKING_CONTENT,
-     "BlockedTrackerUri", NS_LITERAL_CSTRING("Tracking Protection")},
+     "TrackerUriBlocked", NS_LITERAL_CSTRING("Tracking Protection")},
     {NS_ERROR_FINGERPRINTING_URI,
      nsIWebProgressListener::STATE_BLOCKED_FINGERPRINTING_CONTENT,
-     "BlockedTrackerUri", NS_LITERAL_CSTRING("Tracking Protection")},
+     "TrackerUriBlocked", NS_LITERAL_CSTRING("Tracking Protection")},
     {NS_ERROR_CRYPTOMINING_URI,
      nsIWebProgressListener::STATE_BLOCKED_CRYPTOMINING_CONTENT,
-     "BlockedTrackerUri", NS_LITERAL_CSTRING("Tracking Protection")},
+     "TrackerUriBlocked", NS_LITERAL_CSTRING("Tracking Protection")},
     {NS_ERROR_SOCIALTRACKING_URI,
      nsIWebProgressListener::STATE_BLOCKED_SOCIALTRACKING_CONTENT,
-     "BlockedTrackerUri", NS_LITERAL_CSTRING("Tracking Protection")},
+     "TrackerUriBlocked", NS_LITERAL_CSTRING("Tracking Protection")},
 };
 
 }  // namespace

toolkit/components/antitracking/ContentBlockingNotifier.cpp

@@ -147,7 +147,7 @@ void ReportBlockingToConsole(uint64_t aWindowID, nsIURI* aURI,
             break;
 
           case nsIWebProgressListener::STATE_COOKIES_BLOCKED_TRACKER:
-            message = "BlockedCookieTracker";
+            message = "CookieBlockedTracker";
             category = NS_LITERAL_CSTRING("cookieBlockedTracker");
             break;
 
@@ -157,7 +157,7 @@ void ReportBlockingToConsole(uint64_t aWindowID, nsIURI* aURI,
             break;
 
           case nsIWebProgressListener::STATE_COOKIES_BLOCKED_FOREIGN:
-            message = "BlockedCookieForeign";
+            message = "CookieBlockedForeign";
             category = NS_LITERAL_CSTRING("cookieBlockedForeign");
             break;