From ad1c6503e1aaba5fc47036ae9d3a4fde08a9f65d Mon Sep 17 00:00:00 2001
From: Mythmon <mcooper@mozilla.com>
Date: Wed, 4 Jan 2017 11:22:24 -0800
Subject: [PATCH] Bug 1325797 - shield-recipe-client: Don't fail if the
 dev-mode pref is missing on startup r=rhelmer

MozReview-Commit-ID: CTse7NSUgF2

--HG--
extra : rebase_source : edc533a3a3b9412bf910f60377d6c2b4b843117a
---
 .../shield-recipe-client/bootstrap.js         | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/browser/extensions/shield-recipe-client/bootstrap.js b/browser/extensions/shield-recipe-client/bootstrap.js
index 9afa3b7c5db5..02de5f25b284 100644
--- a/browser/extensions/shield-recipe-client/bootstrap.js
+++ b/browser/extensions/shield-recipe-client/bootstrap.js
@@ -19,7 +19,7 @@ const REASONS = {
 };
 
 const PREF_BRANCH = "extensions.shield-recipe-client.";
-const PREFS = {
+const DEFAULT_PREFS = {
   api_url: "https://self-repair.mozilla.org/api/v1",
   dev_mode: false,
   enabled: true,
@@ -35,7 +35,7 @@ this.install = function() {
   // next startup to run, unless the dev_mode preference is set.
   if (Preferences.get(PREF_SELF_SUPPORT_ENABLED, true)) {
     Preferences.set(PREF_SELF_SUPPORT_ENABLED, false);
-    if (!Services.prefs.getBoolPref(PREF_DEV_MODE, false)) {
+    if (!Preferences.get(PREF_DEV_MODE, false)) {
       shouldRun = false;
     }
   }
@@ -82,21 +82,11 @@ this.uninstall = function() {
 };
 
 function setDefaultPrefs() {
-  const branch = Services.prefs.getDefaultBranch(PREF_BRANCH);
-  for (const [key, val] of Object.entries(PREFS)) {
+  for (const [key, val] of Object.entries(DEFAULT_PREFS)) {
+    const fullKey = PREF_BRANCH + key;
     // If someone beat us to setting a default, don't overwrite it.
-    if (branch.getPrefType(key) !== branch.PREF_INVALID)
-      continue;
-    switch (typeof val) {
-      case "boolean":
-        branch.setBoolPref(key, val);
-        break;
-      case "number":
-        branch.setIntPref(key, val);
-        break;
-      case "string":
-        branch.setCharPref(key, val);
-        break;
+    if (!Preferences.isSet(fullKey)) {
+      Preferences.set(fullKey, val);
     }
   }
 }