From 05fb15050fa495007c5f736db58c53d92b02e1f7 Mon Sep 17 00:00:00 2001
From: Eugen Sawin <esawin@mozilla.com>
Date: Fri, 25 May 2018 00:31:18 +0200
Subject: [PATCH] Bug 1464263 - [1.2] Update settings for non-enabled modules.
 r=jchen

---
 mobile/android/chrome/geckoview/geckoview.js                | 3 ++-
 mobile/android/modules/geckoview/GeckoViewContentModule.jsm | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mobile/android/chrome/geckoview/geckoview.js b/mobile/android/chrome/geckoview/geckoview.js
index 3d8e59e13a8e..aacd0520ff94 100644
--- a/mobile/android/chrome/geckoview/geckoview.js
+++ b/mobile/android/chrome/geckoview/geckoview.js
@@ -94,7 +94,7 @@ var ModuleManager = {
     this._frozenSettings = Object.freeze(Object.assign({}, this._settings));
 
     this.forEach(module => {
-      if (module.enabled && module.impl) {
+      if (module.impl) {
         module.impl.onSettingsUpdate();
       }
     });
@@ -192,6 +192,7 @@ class ModuleInfo {
   onInit() {
     if (this._impl) {
       this._impl.onInit();
+      this._impl.onSettingsUpdate();
     }
     this._loadPhase(this._onInitPhase);
     this._onInitPhase = null;
diff --git a/mobile/android/modules/geckoview/GeckoViewContentModule.jsm b/mobile/android/modules/geckoview/GeckoViewContentModule.jsm
index 0eebbb11b3df..4bf1c3ce6318 100644
--- a/mobile/android/modules/geckoview/GeckoViewContentModule.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewContentModule.jsm
@@ -76,7 +76,7 @@ class GeckoViewContentModule {
           }
         }
 
-        if (settings && enabled) {
+        if (settings) {
           this.onSettingsUpdate();
         }
       }