From 8575748f0021e9169b10fb6c47f70cde80b87fe0 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Wed, 8 Jul 2020 23:37:59 +0000
Subject: [PATCH] Bug 1649879 - Remove URIFixupChild. r=kmag

Differential Revision: https://phabricator.services.mozilla.com/D81946
---
 browser/actors/URIFixupChild.jsm    | 35 -----------------------------
 browser/actors/moz.build            |  1 -
 browser/base/content/browser.js     |  8 -------
 browser/base/content/tab-content.js |  6 -----
 browser/components/BrowserGlue.jsm  | 11 ---------
 5 files changed, 61 deletions(-)
 delete mode 100644 browser/actors/URIFixupChild.jsm

diff --git a/browser/actors/URIFixupChild.jsm b/browser/actors/URIFixupChild.jsm
deleted file mode 100644
index 73b0197fdc94..000000000000
--- a/browser/actors/URIFixupChild.jsm
+++ /dev/null
@@ -1,35 +0,0 @@
-/* vim: set ts=2 sw=2 sts=2 et tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-var EXPORTED_SYMBOLS = ["URIFixupChild"];
-
-const { ActorChild } = ChromeUtils.import(
-  "resource://gre/modules/ActorChild.jsm"
-);
-
-class URIFixupChild extends ActorChild {
-  observe(subject) {
-    let fixupInfo = subject.QueryInterface(Ci.nsIURIFixupInfo);
-    if (!fixupInfo.consumer || fixupInfo.consumer != this.browsingContext) {
-      return;
-    }
-
-    let data = {};
-    for (let f of Object.keys(fixupInfo)) {
-      if (f == "consumer" || typeof fixupInfo[f] == "function") {
-        continue;
-      }
-
-      if (fixupInfo[f] && fixupInfo[f] instanceof Ci.nsIURI) {
-        data[f] = fixupInfo[f].spec;
-      } else {
-        data[f] = fixupInfo[f];
-      }
-    }
-
-    this.mm.sendAsyncMessage("Browser:URIFixup", data);
-  }
-}
diff --git a/browser/actors/moz.build b/browser/actors/moz.build
index 5fa68f7c7ec8..663290b62695 100644
--- a/browser/actors/moz.build
+++ b/browser/actors/moz.build
@@ -76,7 +76,6 @@ FINAL_TARGET_FILES.actors += [
     'SearchTelemetryChild.jsm',
     'SearchTelemetryParent.jsm',
     'SwitchDocumentDirectionChild.jsm',
-    'URIFixupChild.jsm',
     'WebRTCChild.jsm',
     'WebRTCParent.jsm',
 ]
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 2c9572188e57..11fed276bedc 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1966,10 +1966,6 @@ var gBrowserInit = {
     Services.obs.addObserver(gXPInstallObserver, "addon-install-failed");
     Services.obs.addObserver(gXPInstallObserver, "addon-install-confirmation");
     Services.obs.addObserver(gXPInstallObserver, "addon-install-complete");
-    window.messageManager.addMessageListener(
-      "Browser:URIFixup",
-      gKeywordURIFixup
-    );
     Services.obs.addObserver(gKeywordURIFixup, "keyword-uri-fixup");
 
     BrowserOffline.init();
@@ -2508,10 +2504,6 @@ var gBrowserInit = {
         "addon-install-confirmation"
       );
       Services.obs.removeObserver(gXPInstallObserver, "addon-install-complete");
-      window.messageManager.removeMessageListener(
-        "Browser:URIFixup",
-        gKeywordURIFixup
-      );
       Services.obs.removeObserver(gKeywordURIFixup, "keyword-uri-fixup");
 
       if (AppConstants.isPlatformAndVersionAtLeast("win", "10")) {
diff --git a/browser/base/content/tab-content.js b/browser/base/content/tab-content.js
index 7825d5d4447f..1a01d4a2ded9 100644
--- a/browser/base/content/tab-content.js
+++ b/browser/base/content/tab-content.js
@@ -20,12 +20,6 @@ ChromeUtils.defineModuleGetter(
   "resource://gre/modules/BrowserUtils.jsm"
 );
 
-var { ActorManagerChild } = ChromeUtils.import(
-  "resource://gre/modules/ActorManagerChild.jsm"
-);
-
-ActorManagerChild.attach(this, "browsers");
-
 // BrowserChildGlobal
 var global = this;
 
diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm
index 1b668fe6fa5c..8bb41f172c15 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -584,16 +584,6 @@ let JSWINDOWACTORS = {
   },
 };
 
-let LEGACY_ACTORS = {
-  URIFixup: {
-    child: {
-      module: "resource:///actors/URIFixupChild.jsm",
-      group: "browsers",
-      observers: ["keyword-uri-fixup"],
-    },
-  },
-};
-
 (function earlyBlankFirstPaint() {
   if (
     AppConstants.platform == "macosx" ||
@@ -1185,7 +1175,6 @@ BrowserGlue.prototype = {
 
     ActorManagerParent.addJSProcessActors(JSPROCESSACTORS);
     ActorManagerParent.addJSWindowActors(JSWINDOWACTORS);
-    ActorManagerParent.addLegacyActors(LEGACY_ACTORS);
     ActorManagerParent.flush();
 
     this._flashHangCount = 0;