From 721aadf5c6908bec10d172d77f6cd5d0a4468451 Mon Sep 17 00:00:00 2001
From: Nicolas Chevobbe <nchevobbe@mozilla.com>
Date: Tue, 3 Dec 2019 10:10:56 +0000
Subject: [PATCH] Bug 1591874 - Move VariablesView files to
 devtools/client/storage. r=miker.

Since the storage inspector is the last consumer of the VariablesView,
it makes sense to move the component directly in the storage inspector
folder.
Since it can't have a controller, the bits where we were checking this
are removed.

Differential Revision: https://phabricator.services.mozilla.com/D54734

--HG--
extra : moz-landing-system : lando
---
 devtools/.eslintrc.js                                          | 3 +++
 .../unit/test_VariablesView_filtering-without-controller.js    | 2 +-
 .../shared/test/unit/test_VariablesView_getString_promise.js   | 2 +-
 devtools/client/storage/moz.build                              | 3 ++-
 devtools/client/storage/ui.js                                  | 2 +-
 devtools/server/actors/webconsole/utils.js                     | 2 +-
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/devtools/.eslintrc.js b/devtools/.eslintrc.js
index af410087459b..83ee1864cc83 100644
--- a/devtools/.eslintrc.js
+++ b/devtools/.eslintrc.js
@@ -32,6 +32,7 @@ module.exports = {
       "client/framework/**",
       "client/shared/*.jsm",
       "client/shared/widgets/*.jsm",
+      "client/storage/VariablesView.jsm",
     ],
     "rules": {
       "consistent-return": "off",
@@ -64,6 +65,8 @@ module.exports = {
     "files": [
       "client/framework/**",
       "client/shared/widgets/*.jsm",
+      "client/storage/VariablesView.jsm",
+      "client/storage/VariablesView.jsm",
     ],
     "rules": {
       "no-shadow": "off",
diff --git a/devtools/client/shared/test/unit/test_VariablesView_filtering-without-controller.js b/devtools/client/shared/test/unit/test_VariablesView_filtering-without-controller.js
index 7c8eab456261..d819ef847c07 100644
--- a/devtools/client/shared/test/unit/test_VariablesView_filtering-without-controller.js
+++ b/devtools/client/shared/test/unit/test_VariablesView_filtering-without-controller.js
@@ -6,7 +6,7 @@
 // Test that VariablesView._doSearch() works even without an attached
 // VariablesViewController (bug 1196341).
 const { VariablesView } = ChromeUtils.import(
-  "resource://devtools/client/shared/widgets/VariablesView.jsm"
+  "resource://devtools/client/storage/VariablesView.jsm"
 );
 const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
 const { globals } = require("devtools/shared/builtin-modules");
diff --git a/devtools/client/shared/test/unit/test_VariablesView_getString_promise.js b/devtools/client/shared/test/unit/test_VariablesView_getString_promise.js
index 19453befce42..4f42bfe95c95 100644
--- a/devtools/client/shared/test/unit/test_VariablesView_getString_promise.js
+++ b/devtools/client/shared/test/unit/test_VariablesView_getString_promise.js
@@ -4,7 +4,7 @@
 "use strict";
 
 const { VariablesView } = ChromeUtils.import(
-  "resource://devtools/client/shared/widgets/VariablesView.jsm"
+  "resource://devtools/client/storage/VariablesView.jsm"
 );
 
 const PENDING = {
diff --git a/devtools/client/storage/moz.build b/devtools/client/storage/moz.build
index 55534b228628..9e0c7dc18536 100644
--- a/devtools/client/storage/moz.build
+++ b/devtools/client/storage/moz.build
@@ -8,7 +8,8 @@ BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
 
 DevToolsModules(
     'panel.js',
-    'ui.js'
+    'ui.js',
+    'VariablesView.jsm',
 )
 
 with Files('**'):
diff --git a/devtools/client/storage/ui.js b/devtools/client/storage/ui.js
index 82f2e0812137..d7513fb2f5ff 100644
--- a/devtools/client/storage/ui.js
+++ b/devtools/client/storage/ui.js
@@ -32,7 +32,7 @@ loader.lazyRequireGetter(
 loader.lazyImporter(
   this,
   "VariablesView",
-  "resource://devtools/client/shared/widgets/VariablesView.jsm"
+  "resource://devtools/client/storage/VariablesView.jsm"
 );
 
 /**
diff --git a/devtools/server/actors/webconsole/utils.js b/devtools/server/actors/webconsole/utils.js
index 4b1bcd5c9f03..75c2333e6efc 100644
--- a/devtools/server/actors/webconsole/utils.js
+++ b/devtools/server/actors/webconsole/utils.js
@@ -13,7 +13,7 @@ if (!isWorker) {
   loader.lazyImporter(
     this,
     "VariablesView",
-    "resource://devtools/client/shared/widgets/VariablesView.jsm"
+    "resource://devtools/client/storage/VariablesView.jsm"
   );
   loader.lazyRequireGetter(
     this,