Merge inbound to mozilla-central. a=merge
authorCsoregi Natalia <ncsoregi@mozilla.com>
Mon, 06 Aug 2018 01:59:45 +0300
changeset 485303 7a3737f257d5
parent 485296 6ffbddf32df5 (current diff)
parent 485302 bcd31adc1e7a (diff)
child 485305 629620d98888
child 485312 9022686cf029
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone63.0a1
first release with
nightly linux32
7a3737f257d5 / 63.0a1 / 20180805231147 / files
nightly linux64
7a3737f257d5 / 63.0a1 / 20180805231147 / files
nightly mac
7a3737f257d5 / 63.0a1 / 20180805231147 / files
nightly win32
7a3737f257d5 / 63.0a1 / 20180805231147 / files
nightly win64
7a3737f257d5 / 63.0a1 / 20180805231147 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge inbound to mozilla-central. a=merge
--- a/testing/marionette/prefs.js
+++ b/testing/marionette/prefs.js
@@ -9,17 +9,16 @@ ChromeUtils.import("resource://gre/modul
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 XPCOMUtils.defineLazyServiceGetter(this, "env",
     "@mozilla.org/process/environment;1",
     "nsIEnvironment");
 
 const {
   PREF_BOOL,
-  PREF_COMPLEX,
   PREF_INT,
   PREF_INVALID,
   PREF_STRING,
 } = Ci.nsIPrefBranch;
 
 this.EXPORTED_SYMBOLS = [
   "Branch",
   "MarionettePrefs",
@@ -56,19 +55,16 @@ class Branch {
         return this._branch.getStringPref(pref);
 
       case PREF_BOOL:
         return this._branch.getBoolPref(pref);
 
       case PREF_INT:
         return this._branch.getIntPref(pref);
 
-      case PREF_COMPLEX:
-        throw new TypeError(`Unsupported complex preference: ${pref}`);
-
       case PREF_INVALID:
       default:
         if (fallback != null) {
           return fallback;
         }
         throw new TypeError(`Unrecognised preference: ${pref}`);
     }
   }