Bug 1531176 - about:support: also support the split of the key r=florian,flod
authorSylvestre Ledru <sledru@mozilla.com>
Sun, 10 Mar 2019 15:29:42 +0000
changeset 521291 b59042f5f5bc
parent 521290 43376e0c3563
child 521292 99b57fdeaf54
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflorian, flod
bugs1531176
milestone67.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 1531176 - about:support: also support the split of the key r=florian,flod Differential Revision: https://phabricator.services.mozilla.com/D22676
browser/base/content/test/about/browser_aboutSupport.js
python/l10n/fluent_migrations/bug_1507595_aboutsupport.py
toolkit/content/aboutSupport.xhtml
toolkit/locales/en-US/toolkit/about/aboutSupport.ftl
toolkit/modules/tests/browser/browser_Troubleshoot.js
--- a/browser/base/content/test/about/browser_aboutSupport.js
+++ b/browser/base/content/test/about/browser_aboutSupport.js
@@ -1,22 +1,31 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 add_task(async function() {
   await BrowserTestUtils.withNewTab({ gBrowser, url: "about:support" }, async function(browser) {
-    let keyGoogleStatus = await ContentTask.spawn(browser, null, async function() {
-      let textBox = content.document.getElementById("key-google-box");
+    let keyLocationServiceGoogleStatus = await ContentTask.spawn(browser, null, async function() {
+      let textBox = content.document.getElementById("key-location-service-google-box");
       await ContentTaskUtils.waitForCondition(() => content.document.l10n.getAttributes(textBox).id,
-        "Google API key status loaded");
+        "Google location service API key status loaded");
       return content.document.l10n.getAttributes(textBox).id;
     });
-    ok(keyGoogleStatus, "Google API key status shown");
+    ok(keyLocationServiceGoogleStatus, "Google location service API key status shown");
+
+    let keySafebrowsingGoogleStatus = await ContentTask.spawn(browser, null, async function() {
+      let textBox = content.document.getElementById("key-safebrowsing-google-box");
+      await ContentTaskUtils.waitForCondition(() => content.document.l10n.getAttributes(textBox).id,
+        "Google Safebrowsing API key status loaded");
+      return content.document.l10n.getAttributes(textBox).id;
+    });
+    ok(keySafebrowsingGoogleStatus, "Google Safebrowsing API key status shown");
+
 
     let keyMozillaStatus = await ContentTask.spawn(browser, null, async function() {
       let textBox = content.document.getElementById("key-mozilla-box");
       await ContentTaskUtils.waitForCondition(() => content.document.l10n.getAttributes(textBox).id,
         "Mozilla API key status loaded");
       return content.document.l10n.getAttributes(textBox).id;
     });
     ok(keyMozillaStatus, "Mozilla API key status shown");
--- a/python/l10n/fluent_migrations/bug_1507595_aboutsupport.py
+++ b/python/l10n/fluent_migrations/bug_1507595_aboutsupport.py
@@ -54,17 +54,18 @@ app-basics-user-agent = { COPY("toolkit/
 app-basics-os = { COPY("toolkit/chrome/global/aboutSupport.dtd", "aboutSupport.appBasicsOS")}
 app-basics-memory-use = { COPY("toolkit/chrome/global/aboutSupport.dtd", "aboutSupport.appBasicsMemoryUse")}
 app-basics-performance = { COPY("toolkit/chrome/global/aboutSupport.dtd", "aboutSupport.appBasicsPerformance")}
 app-basics-service-workers = { COPY("toolkit/chrome/global/aboutSupport.dtd", "aboutSupport.appBasicsServiceWorkers")}
 app-basics-profiles = { COPY("toolkit/chrome/global/aboutSupport.dtd", "aboutSupport.appBasicsProfiles")}
 app-basics-multi-process-support = { COPY("toolkit/chrome/global/aboutSupport.dtd", "aboutSupport.appBasicsMultiProcessSupport")}
 app-basics-process-count = { COPY("toolkit/chrome/global/aboutSupport.dtd", "aboutSupport.appBasicsProcessCount")}
 app-basics-enterprise-policies = { COPY("toolkit/chrome/global/aboutSupport.dtd", "aboutSupport.enterprisePolicies")}
-app-basics-key-google = { COPY("toolkit/chrome/global/aboutSupport.dtd", "aboutSupport.appBasicsKeyGoogle")}
+app-basics-location-service-key-google = { COPY("toolkit/chrome/global/aboutSupport.dtd", "aboutSupport.appBasicsLocationServiceKeyGoogle")}
+app-basics-safebrowsing-key-google = { COPY("toolkit/chrome/global/aboutSupport.dtd", "aboutSupport.appBasicsSafebrowsingKeyGoogle")}
 app-basics-key-mozilla = { COPY("toolkit/chrome/global/aboutSupport.dtd", "aboutSupport.appBasicsKeyMozilla")}
 app-basics-safe-mode = { COPY("toolkit/chrome/global/aboutSupport.dtd", "aboutSupport.appBasicsSafeMode")}
 modified-key-prefs-title = { COPY("toolkit/chrome/global/aboutSupport.dtd", "aboutSupport.modifiedKeyPrefsTitle")}
 modified-prefs-name = { COPY("toolkit/chrome/global/aboutSupport.dtd", "aboutSupport.modifiedPrefsName")}
 modified-prefs-value = { COPY("toolkit/chrome/global/aboutSupport.dtd", "aboutSupport.modifiedPrefsValue")}
 user-js-title = { COPY("toolkit/chrome/global/aboutSupport.dtd", "aboutSupport.userJSTitle")}
 locked-key-prefs-title = { COPY("toolkit/chrome/global/aboutSupport.dtd", "aboutSupport.lockedKeyPrefsTitle")}
 locked-prefs-name = { COPY("toolkit/chrome/global/aboutSupport.dtd", "aboutSupport.lockedPrefsName")}
--- a/toolkit/content/aboutSupport.xhtml
+++ b/toolkit/content/aboutSupport.xhtml
@@ -189,19 +189,26 @@
           <tr id="policies-status-row">
             <th class="column" data-l10n-id="app-basics-enterprise-policies"/>
 
             <td id="policies-status">
             </td>
           </tr>
 
           <tr>
-            <th class="column" data-l10n-id="app-basics-key-google"/>
+            <th class="column" data-l10n-id="app-basics-location-service-key-google"/>
 
-            <td id="key-google-box">
+            <td id="key-location-service-google-box">
+            </td>
+          </tr>
+
+          <tr>
+            <th class="column" data-l10n-id="app-basics-safebrowsing-key-google"/>
+
+            <td id="key-safebrowsing-google-box">
             </td>
           </tr>
 
           <tr>
             <th class="column" data-l10n-id="app-basics-key-mozilla"/>
 
             <td id="key-mozilla-box">
             </td>
--- a/toolkit/locales/en-US/toolkit/about/aboutSupport.ftl
+++ b/toolkit/locales/en-US/toolkit/about/aboutSupport.ftl
@@ -47,17 +47,18 @@ app-basics-os = OS
 app-basics-memory-use = Memory Use
 app-basics-performance = Performance
 app-basics-service-workers = Registered Service Workers
 app-basics-profiles = Profiles
 app-basics-launcher-process-status = Launcher Process
 app-basics-multi-process-support = Multiprocess Windows
 app-basics-process-count = Web Content Processes
 app-basics-enterprise-policies = Enterprise Policies
-app-basics-key-google = Google Key
+app-basics-location-service-key-google = Google Location Service Key
+app-basics-safebrowsing-key-google = Google Safebrowsing Key
 app-basics-key-mozilla = Mozilla Location Service Key
 app-basics-safe-mode = Safe Mode
 show-dir-label =
     { PLATFORM() ->
         [macos] Show in Finder
         [windows] Open Folder
        *[other] Open Directory
     }
--- a/toolkit/modules/tests/browser/browser_Troubleshoot.js
+++ b/toolkit/modules/tests/browser/browser_Troubleshoot.js
@@ -144,17 +144,20 @@ const SNAPSHOT_SCHEMA = {
           type: "number",
         },
         maxContentProcesses: {
           type: "number",
         },
         policiesStatus: {
           type: "number",
         },
-        keyGoogleFound: {
+        keyLocationServiceGoogleFound: {
+          type: "boolean",
+        },
+        keySafebrowsingGoogleFound: {
           type: "boolean",
         },
         keyMozillaFound: {
           type: "boolean",
         },
         safeMode: {
           type: "boolean",
         },