From f44cf7f44d7546655915ccc49de97dc9e87c2c6e Mon Sep 17 00:00:00 2001
From: Stephen Pohl <spohl.mozilla.bugs@gmail.com>
Date: Tue, 10 Mar 2015 20:30:58 -0400
Subject: [PATCH] Bug 1140522: Ensure proper use of appDisabled and
 userDisabled in GMPProvider.jsm. r=mossop

---
 toolkit/mozapps/extensions/internal/GMPProvider.jsm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/toolkit/mozapps/extensions/internal/GMPProvider.jsm b/toolkit/mozapps/extensions/internal/GMPProvider.jsm
index b1c41ea40a9..f2c350021c6 100644
--- a/toolkit/mozapps/extensions/internal/GMPProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/GMPProvider.jsm
@@ -214,13 +214,15 @@ GMPWrapper.prototype = {
                                       this._plugin.id); },
 
   get isActive() { return !this.userDisabled; },
-  get appDisabled() { return false; },
-
-  get userDisabled() {
+  get appDisabled() {
     if (this._plugin.isEME && !GMPPrefs.get(KEY_EME_ENABLED, true)) {
       // If "media.eme.enabled" is false, all EME plugins are disabled.
       return true;
     }
+   return false;
+  },
+
+  get userDisabled() {
     return !GMPPrefs.get(KEY_PLUGIN_ENABLED, true, this._plugin.id);
   },
   set userDisabled(aVal) { GMPPrefs.set(KEY_PLUGIN_ENABLED, aVal === false,