From f9fa5abc5677a69f53e5387dd3165c88a2b67f68 Mon Sep 17 00:00:00 2001
From: Alexandre Poirot <poirot.alex@gmail.com>
Date: Tue, 13 Apr 2021 13:44:24 +0000
Subject: [PATCH] Bug 1699111 - [devtools] Rename DevToolsClient._closed to
 _transportClosed. r=jdescottes

This better highlight that may only be the transport that is closed and not the whole client.
But at the end, both should follow the same lifecycle and be destroyed altogether.

Differential Revision: https://phabricator.services.mozilla.com/D108813
---
 .../client/aboutdebugging/src/modules/client-wrapper.js   | 2 +-
 devtools/client/devtools-client.js                        | 8 ++++----
 .../framework/test/browser_toolbox_remoteness_change.js   | 2 +-
 .../shared/remote-debugging/remote-client-manager.js      | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/devtools/client/aboutdebugging/src/modules/client-wrapper.js b/devtools/client/aboutdebugging/src/modules/client-wrapper.js
index 838ae9b55cd2..53c317587128 100644
--- a/devtools/client/aboutdebugging/src/modules/client-wrapper.js
+++ b/devtools/client/aboutdebugging/src/modules/client-wrapper.js
@@ -166,7 +166,7 @@ class ClientWrapper {
   }
 
   isClosed() {
-    return this.client._closed;
+    return this.client._transportClosed;
   }
 
   // This method will be mocked to return a dummy URL during mochitests
diff --git a/devtools/client/devtools-client.js b/devtools/client/devtools-client.js
index 61f12bbee8c9..dbc6e5ace6ff 100644
--- a/devtools/client/devtools-client.js
+++ b/devtools/client/devtools-client.js
@@ -113,7 +113,7 @@ DevToolsClient.prototype = {
    *         Resolves after the underlying transport is closed.
    */
   close() {
-    if (this._closed) {
+    if (this._transportClosed) {
       return Promise.resolve();
     }
     if (this._closePromise) {
@@ -213,7 +213,7 @@ DevToolsClient.prototype = {
       return onResponse(response) || response;
     };
 
-    if (this._closed) {
+    if (this._transportClosed) {
       const msg =
         "'" +
         type +
@@ -589,10 +589,10 @@ DevToolsClient.prototype = {
    *        the stream.
    */
   onTransportClosed() {
-    if (this._closed) {
+    if (this._transportClosed) {
       return;
     }
-    this._closed = true;
+    this._transportClosed = true;
     this.emit("closed");
 
     this.purgeRequests();
diff --git a/devtools/client/framework/test/browser_toolbox_remoteness_change.js b/devtools/client/framework/test/browser_toolbox_remoteness_change.js
index 15684815e4bc..b7466d636bfc 100644
--- a/devtools/client/framework/test/browser_toolbox_remoteness_change.js
+++ b/devtools/client/framework/test/browser_toolbox_remoteness_change.js
@@ -48,5 +48,5 @@ add_task(async function() {
 
   const { client } = toolbox.target;
   await toolbox.destroy();
-  ok(client._closed, "The client is closed after closing the toolbox");
+  ok(client._transportClosed, "The client is closed after closing the toolbox");
 });
diff --git a/devtools/client/shared/remote-debugging/remote-client-manager.js b/devtools/client/shared/remote-debugging/remote-client-manager.js
index d441137fba70..db5ae34d0706 100644
--- a/devtools/client/shared/remote-debugging/remote-client-manager.js
+++ b/devtools/client/shared/remote-debugging/remote-client-manager.js
@@ -131,7 +131,7 @@ class RemoteClientManager {
    */
   _onClientClosed() {
     const closedClientKeys = [...this._clients.keys()].filter(key => {
-      return this._clients.get(key)._closed;
+      return this._clients.get(key)._transportClosed;
     });
 
     for (const key of closedClientKeys) {