DevTools: move FileSystemMapping from Workspace to Persistence

third_party/WebKit/Source/devtools/front_end/settings/EditFileSystemView.js

Index: third_party/WebKit/Source/devtools/front_end/settings/EditFileSystemView.js
diff --git a/third_party/WebKit/Source/devtools/front_end/settings/EditFileSystemView.js b/third_party/WebKit/Source/devtools/front_end/settings/EditFileSystemView.js
index 9d4d9bd5ccd4d126b4dee49ebad1801c009f738a..63d4d0c636739929340336ee60530789bd916351 100644
--- a/third_party/WebKit/Source/devtools/front_end/settings/EditFileSystemView.js
+++ b/third_party/WebKit/Source/devtools/front_end/settings/EditFileSystemView.js
@@ -40,11 +40,12 @@ Settings.EditFileSystemView = class extends UI.VBox {
     this.registerRequiredCSS('settings/editFileSystemView.css');
     this._fileSystemPath = fileSystemPath;
 
+    this._fileSystemMapping = Persistence.fileSystemMapping;
     this._eventListeners = [
-      Workspace.fileSystemMapping.addEventListener(
-          Workspace.FileSystemMapping.Events.FileMappingAdded, this._update, this),
-      Workspace.fileSystemMapping.addEventListener(
-          Workspace.FileSystemMapping.Events.FileMappingRemoved, this._update, this),
+      this._fileSystemMapping.addEventListener(
+          Persistence.FileSystemMapping.Events.FileMappingAdded, this._update, this),
+      this._fileSystemMapping.addEventListener(
+          Persistence.FileSystemMapping.Events.FileMappingRemoved, this._update, this),
       Workspace.isolatedFileSystemManager.addEventListener(
           Workspace.IsolatedFileSystemManager.Events.ExcludedFolderAdded, this._update, this),
       Workspace.isolatedFileSystemManager.addEventListener(
@@ -102,7 +103,7 @@ Settings.EditFileSystemView = class extends UI.VBox {
     this._mappings = [];
     if (Runtime.experiments.isEnabled('persistence2'))
       return;
-    var mappings = Workspace.fileSystemMapping.mappingEntries(this._fileSystemPath);
+    var mappings = this._fileSystemMapping.mappingEntries(this._fileSystemPath);
     for (var entry of mappings) {
       if (entry.configurable) {
         this._mappingsList.appendItem(entry, true);
@@ -133,7 +134,7 @@ Settings.EditFileSystemView = class extends UI.VBox {
   }
 
   _addMappingButtonClicked() {
-    var entry = new Workspace.FileSystemMapping.Entry(this._fileSystemPath, '', '', true);
+    var entry = new Persistence.FileSystemMapping.Entry(this._fileSystemPath, '', '', true);
     this._mappingsList.addNewItem(0, entry);
   }
 
@@ -151,8 +152,8 @@ Settings.EditFileSystemView = class extends UI.VBox {
     var element = createElementWithClass('div', 'file-system-list-item');
     if (!editable)
       element.classList.add('locked');
-    if (item instanceof Workspace.FileSystemMapping.Entry) {
-      var entry = /** @type {!Workspace.FileSystemMapping.Entry} */ (item);
+    if (item instanceof Persistence.FileSystemMapping.Entry) {
+      var entry = /** @type {!Persistence.FileSystemMapping.Entry} */ (item);
       var urlPrefix = entry.configurable ? entry.urlPrefix : Common.UIString('%s (via .devtools)', entry.urlPrefix);
       var urlPrefixElement = element.createChild('div', 'file-system-value');
       urlPrefixElement.textContent = urlPrefix;
@@ -177,9 +178,9 @@ Settings.EditFileSystemView = class extends UI.VBox {
    * @param {number} index
    */
   removeItemRequested(item, index) {
-    if (item instanceof Workspace.FileSystemMapping.Entry) {
+    if (item instanceof Persistence.FileSystemMapping.Entry) {
       var entry = this._mappings[index];
-      Workspace.fileSystemMapping.removeFileMapping(entry.fileSystemPath, entry.urlPrefix, entry.pathPrefix);
+      this._fileSystemMapping.removeFileMapping(entry.fileSystemPath, entry.urlPrefix, entry.pathPrefix);
     } else {
       Workspace.isolatedFileSystemManager.fileSystem(this._fileSystemPath)
           .removeExcludedFolder(this._excludedFolders[index]);
@@ -194,11 +195,11 @@ Settings.EditFileSystemView = class extends UI.VBox {
    */
   commitEdit(item, editor, isNew) {
     this._muteUpdate = true;
-    if (item instanceof Workspace.FileSystemMapping.Entry) {
-      var entry = /** @type {!Workspace.FileSystemMapping.Entry} */ (item);
+    if (item instanceof Persistence.FileSystemMapping.Entry) {
+      var entry = /** @type {!Persistence.FileSystemMapping.Entry} */ (item);
       if (!isNew)
-        Workspace.fileSystemMapping.removeFileMapping(this._fileSystemPath, entry.urlPrefix, entry.pathPrefix);
-      Workspace.fileSystemMapping.addFileMapping(
+        this._fileSystemMapping.removeFileMapping(this._fileSystemPath, entry.urlPrefix, entry.pathPrefix);
+      this._fileSystemMapping.addFileMapping(
           this._fileSystemPath, this._normalizePrefix(editor.control('urlPrefix').value),
           this._normalizePrefix(editor.control('pathPrefix').value));
     } else {
@@ -219,8 +220,8 @@ Settings.EditFileSystemView = class extends UI.VBox {
    * @return {!UI.ListWidget.Editor}
    */
   beginEdit(item) {
-    if (item instanceof Workspace.FileSystemMapping.Entry) {
-      var entry = /** @type {!Workspace.FileSystemMapping.Entry} */ (item);
+    if (item instanceof Persistence.FileSystemMapping.Entry) {
+      var entry = /** @type {!Persistence.FileSystemMapping.Entry} */ (item);
       var editor = this._createMappingEditor();
       editor.control('urlPrefix').value = entry.urlPrefix;
       editor.control('pathPrefix').value = entry.pathPrefix;