Bug 1483445 - Change string from tracking protection to content blocking r=dragana!
authorValentin Gosu <valentin.gosu@gmail.com>
Mon, 20 Aug 2018 08:43:08 +0000
changeset 432419 ffb2036e3283325cc68ef0c91d906b65b88348d3
parent 432418 b7bbd708f984f03f6c49af4997b3082ffd440de9
child 432420 fb70309402b4aa63cff4ffa42c95daff8af2df2f
push id106731
push usershindli@mozilla.com
push dateMon, 20 Aug 2018 16:36:25 +0000
treeherdermozilla-inbound@14ef4dec6126 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdragana
bugs1483445
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1483445 - Change string from tracking protection to content blocking r=dragana! Differential Revision: https://phabricator.services.mozilla.com/D3440
devtools/client/webconsole/test/mochitest/browser_webconsole_trackingprotection_errors.js
netwerk/base/nsChannelClassifier.cpp
netwerk/locales/en-US/necko.properties
--- a/devtools/client/webconsole/test/mochitest/browser_webconsole_trackingprotection_errors.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_trackingprotection_errors.js
@@ -23,17 +23,17 @@ registerCleanupFunction(function() {
 add_task(async function testMessagesAppear() {
   await UrlClassifierTestUtils.addTestTrackers();
   await pushPref("privacy.trackingprotection.enabled", true);
 
   const hud = await openNewTabAndConsole(TEST_URI);
 
   const message = await waitFor(() => findMessage(hud,
     "The resource at \u201chttp://tracking.example.com/\u201d was " +
-    "blocked because tracking protection is enabled"));
+    "blocked because content blocking is enabled"));
 
   await testClickOpenNewTab(hud, message);
 });
 
 async function testClickOpenNewTab(hud, message) {
   info("Clicking on the Learn More link");
 
   const learnMoreLink = message.querySelector(".learn-more-link");
--- a/netwerk/base/nsChannelClassifier.cpp
+++ b/netwerk/base/nsChannelClassifier.cpp
@@ -884,17 +884,17 @@ nsChannelClassifier::SetBlockedContent(n
   pwin->NotifyContentBlockingState(state, channel);
 
   // Log a warning to the web console.
   nsCOMPtr<nsIURI> uri;
   channel->GetURI(getter_AddRefs(uri));
   NS_ConvertUTF8toUTF16 spec(uri->GetSpecOrDefault());
   const char16_t* params[] = { spec.get() };
   const char* message = (aErrorCode == NS_ERROR_TRACKING_URI) ?
-    "TrackingUriBlocked" : "UnsafeUriBlocked";
+    "TrackerUriBlocked" : "UnsafeUriBlocked";
   nsCString category = (aErrorCode == NS_ERROR_TRACKING_URI) ?
     NS_LITERAL_CSTRING("Tracking Protection") :
     NS_LITERAL_CSTRING("Safe Browsing");
 
   nsContentUtils::ReportToConsole(nsIScriptError::warningFlag,
                                   category,
                                   doc,
                                   nsContentUtils::eNECKO_PROPERTIES,
--- a/netwerk/locales/en-US/necko.properties
+++ b/netwerk/locales/en-US/necko.properties
@@ -35,14 +35,14 @@ DirColSize=Size
 DirColMTime=Last Modified
 DirFileLabel=File: 
 
 PhishingAuth=You are about to visit “%1$S”. This site may be attempting to trick you into thinking you are visiting a different site. Use extreme caution.
 PhishingAuthAccept=I understand and will be very careful
 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”.
 
-TrackingUriBlocked=The resource at “%1$S” was blocked because 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.
 
 # LOCALIZATION NOTE (nsICookieManagerAPIDeprecated): don't localize originAttributes.
 # %1$S is the deprecated API; %2$S is the interface suffix that the given deprecated API belongs to.
 nsICookieManagerAPIDeprecated=“%1$S” is changed. Update your code and pass the correct originAttributes. Read more on MDN: https://developer.mozilla.org/docs/Mozilla/Tech/XPCOM/Reference/Interface/nsICookieManager%2$S