From e3ee71f734db2859f606d878caee1cb8463542c9 Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Tue, 26 Jan 2021 13:44:11 +0000
Subject: [PATCH] Bug 1687235 - Enable ESLint rule no-setter-return for
 mobile/. r=agi

Differential Revision: https://phabricator.services.mozilla.com/D102156
---
 .eslintrc.js                                             | 9 ---------
 .../android/chrome/geckoview/SessionStateAggregator.js   | 2 --
 mobile/android/modules/geckoview/DelayedInit.jsm         | 4 ++--
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index ccfdd0571bb59..308c2b00c7c59 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -660,14 +660,5 @@ module.exports = {
         "mozilla/reject-chromeutils-import-null": "off",
       },
     },
-    {
-      files: [
-        "mobile/android/chrome/geckoview/SessionStateAggregator.js",
-        "mobile/android/modules/geckoview/DelayedInit.jsm",
-      ],
-      rules: {
-        "no-setter-return": "off",
-      },
-    },
   ],
 };
diff --git a/mobile/android/chrome/geckoview/SessionStateAggregator.js b/mobile/android/chrome/geckoview/SessionStateAggregator.js
index 55d743d2455df..9a568c40bff34 100644
--- a/mobile/android/chrome/geckoview/SessionStateAggregator.js
+++ b/mobile/android/chrome/geckoview/SessionStateAggregator.js
@@ -454,8 +454,6 @@ class MessageQueue extends Handler {
       clearTimeout(this._timeout);
       this._timeout = null;
     }
-
-    return val;
   }
 
   uninit() {
diff --git a/mobile/android/modules/geckoview/DelayedInit.jsm b/mobile/android/modules/geckoview/DelayedInit.jsm
index 4b03b126da4b2..a91161292864f 100644
--- a/mobile/android/modules/geckoview/DelayedInit.jsm
+++ b/mobile/android/modules/geckoview/DelayedInit.jsm
@@ -177,12 +177,12 @@ var Impl = {
         // we can get rid of our proxy property.
         if (prop.get || prop.set) {
           Object.defineProperty(object, name, prop);
-          return prop.set.call(object);
+          prop.set.call(object);
+          return;
         }
 
         prop.value = newVal;
         Object.defineProperty(object, name, prop);
-        return newVal;
       },
       configurable: true,
       enumerable: true,