From 26df3a25633b409decfdb346fa6019146831e813 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sledru@mozilla.com>
Date: Mon, 19 Mar 2018 10:45:29 +0100
Subject: [PATCH] Bug 1446809 - Remove some b2g leftover in
 devtools/shared/system.js r=jdescottes

MozReview-Commit-ID: 1YlBPwjyWO2

--HG--
extra : rebase_source : fac6339de325bbdbc7f243cbe82fe3fe8d49a69b
extra : source : 42146f3856d007bba68045f84a44090efed3c498
---
 devtools/shared/system.js | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/devtools/shared/system.js b/devtools/shared/system.js
index ec23facbc256..4c289658945d 100644
--- a/devtools/shared/system.js
+++ b/devtools/shared/system.js
@@ -39,7 +39,6 @@ const APP_MAP = {
   "{3550f703-e582-4d05-9a08-453d09bdfdc6}": "thunderbird",
   "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}": "seamonkey",
   "{718e30fb-e89b-41dd-9da7-e25a45638b28}": "sunbird",
-  "{3c2e2abc-06d4-11e1-ac3b-374f68613e61}": "b2g",
   "{aa3c5121-dab2-40e2-81ca-7ea25febc110}": "mobile/android"
 };
 
@@ -67,22 +66,8 @@ async function getSystemInfo() {
   let hardware = "unknown";
   let version = "unknown";
 
-  // B2G specific
-  if (apptype === "b2g") {
-    os = "B2G";
-    // `getSetting` does not work in child processes on b2g.
-    // TODO bug 1205797, make this work in child processes.
-    try {
-      hardware = await exports.getSetting("deviceinfo.hardware");
-      version = await exports.getSetting("deviceinfo.os");
-    } catch (e) {
-      // Ignore.
-    }
-  } else {
-    // Not B2G
-    os = appInfo.OS;
-    version = appInfo.version;
-  }
+  os = appInfo.OS;
+  version = appInfo.version;
 
   let bundle = Services.strings.createBundle("chrome://branding/locale/brand.properties");
   if (bundle) {
@@ -124,7 +109,6 @@ async function getSystemInfo() {
     // The application's version, for example "0.8.0+" or "3.7a1pre".
     // Typically, the version of Firefox, for example.
     // It is different than the version of Gecko or the XULRunner platform.
-    // On B2G, this is the Gaia version.
     version,
 
     // The application's build ID/date, for example "2004051604".
@@ -155,7 +139,6 @@ async function getSystemInfo() {
 
     // Name of the OS type. Typically the same as `uname -s`. Possible values:
     // https://developer.mozilla.org/en/OS_TARGET
-    // Also may be "B2G".
     os,
     platform: os,
 
@@ -270,7 +253,6 @@ function getSetting(name) {
   if ("@mozilla.org/settingsService;1" in Cc) {
     let settingsService;
 
-    // settingsService fails in b2g child processes
     // TODO bug 1205797, make this work in child processes.
     try {
       settingsService = Cc["@mozilla.org/settingsService;1"]