fixup! Bug 3455: Add DomainIsolator, for isolating circuit by domain.

Removed the XPCOM definition of the domain isolator.

toolkit/components/tor-launcher/TorDomainIsolator.jsm

 // A component for Tor Browser that puts requests from different
 // first party domains on separate Tor circuits.
 
-var EXPORTED_SYMBOLS = ["DomainIsolator", "TorDomainIsolator"];
+var EXPORTED_SYMBOLS = ["TorDomainIsolator"];
 
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
@@ -277,31 +277,3 @@ class TorDomainIsolatorImpl {
 }
 
 const TorDomainIsolator = new TorDomainIsolatorImpl();
-
-// The DomainIsolator object, used only to access this feature through XPCOM.
-// TODO: Remove this, and directly use the module, instead.
-class DomainIsolator {
-  constructor() {
-    this.wrappedJSObject = this;
-  }
-
-  newCircuitForDomain(domain) {
-    TorDomainIsolator.newCircuitForDomain(domain);
-  }
-
-  newCircuitForUserContextId(userContextId) {
-    TorDomainIsolator.newCircuitForUserContextId(userContextId);
-  }
-
-  enableIsolation() {
-    TorDomainIsolator.enable();
-  }
-
-  disableIsolation() {
-    TorDomainIsolator.disable();
-  }
-
-  clearIsolation() {
-    TorDomainIsolator.clearIsolation();
-  }
-}

toolkit/components/tor-launcher/components.conf

@@ -7,15 +7,4 @@ Classes = [
         "jsm": "resource://gre/modules/TorStartupService.jsm",
         "constructor": "TorStartupService",
     },
-
-    # TODO: Remove the component when we make the new circuit button accessing
-    # the module directly.
-    {
-        "cid": "{e33fd6d4-270f-475f-a96f-ff3140279f68}",
-        "contract_ids": [
-            "@torproject.org/domain-isolator;1"
-        ],
-        "jsm": "resource://gre/modules/TorDomainIsolator.jsm",
-        "constructor": "DomainIsolator",
-    },
 ]