Bug 1220531 - Link to the Push notifications article on SUMO. r=MattN

--HG--
extra : commitid : CyXebSUVhVq

browser/app/profile/firefox.js

@@ -995,8 +995,6 @@ pref("urlclassifier.downloadAllowTable", "goog-downloadwhite-digest256");
 #endif
 
 pref("browser.geolocation.warning.infoURL", "https://www.mozilla.org/%LOCALE%/firefox/geolocation/");
-pref("browser.push.warning.infoURL", "https://www.mozilla.org/%LOCALE%/firefox/push/");
-pref("browser.push.warning.migrationURL", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/push#w_upgraded-notifications");
 
 pref("browser.EULA.version", 3);
 pref("browser.rights.version", 3);

browser/base/content/test/alerts/browser_notification_permission_migration.js

@@ -24,7 +24,9 @@ add_task(function* test_permissionMigration() {
   let alertWindow = yield alertWindowPromise;
 
   info("Clicking on notification");
-  let url = Services.urlFormatter.formatURLPref("browser.push.warning.migrationURL");
+  let url =
+    Services.urlFormatter.formatURLPref("app.support.baseURL") +
+    "push#w_upgraded-notifications";
   let closePromise = promiseWindowClosed(alertWindow);
   let tabPromise = BrowserTestUtils.waitForNewTab(gBrowser, url);
   EventUtils.synthesizeMouseAtCenter(alertWindow.document.getElementById("alertTitleLabel"), {}, alertWindow);

browser/components/nsBrowserGlue.js

@@ -2287,7 +2287,8 @@ BrowserGlue.prototype = {
                    "chrome://branding/content/about-logo.png";
     let title = gBrowserBundle.GetStringFromName("webNotifications.upgradeTitle");
     let text = gBrowserBundle.GetStringFromName("webNotifications.upgradeBody");
-    let url = Services.urlFormatter.formatURLPref("browser.push.warning.migrationURL");
+    let url = Services.urlFormatter.formatURLPref("app.support.baseURL") +
+      "push#w_upgraded-notifications";
 
     AlertsService.showAlertNotification(imageURL, title, text,
                                         true, url, clickCallback);
@@ -2765,7 +2766,8 @@ ContentPermissionPrompt.prototype = {
     }
 
     var options = {
-      learnMoreURL: Services.urlFormatter.formatURLPref("browser.push.warning.infoURL"),
+      learnMoreURL:
+        Services.urlFormatter.formatURLPref("app.support.baseURL") + "push",
     };
 
     this._showPrompt(aRequest, message, "desktop-notification", actions,

browser/components/preferences/in-content/content.js

@@ -74,7 +74,8 @@ var gContentPane = {
     setEventListener("notificationsDoNotDisturb", "command",
       gContentPane.toggleDoNotDisturbNotifications);
 
-    let notificationInfoURL = Services.urlFormatter.formatURLPref("browser.push.warning.infoURL");
+    let notificationInfoURL =
+      Services.urlFormatter.formatURLPref("app.support.baseURL") + "push";
     document.getElementById("notificationsPolicyLearnMore").setAttribute("href",
                                                                          notificationInfoURL);
 

testing/profiles/prefs_general.js

@@ -116,8 +116,7 @@ user_pref("network.sntp.pools", "%(server)s");
 user_pref("network.sntp.maxRetryCount", 1);
 
 // Make sure the notification permission migration test doesn't hit the network.
-user_pref("browser.push.warning.infoURL", "http://%(server)s/alerts-dummy/infoURL");
-user_pref("browser.push.warning.migrationURL", "http://%(server)s/alerts-dummy/migrationURL");
+user_pref("app.support.baseURL", "http://%(server)s/support-dummy/");
 
 // Existing tests don't wait for the notification button security delay
 user_pref("security.notification_enable_delay", 0);