Verified Commit 7f2bdf58 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by ma1
Browse files

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

BB 43824: Move from resources:// to moz-src:///.
parent ddaf9d05

browser/base/content/browser.js

+2 −1
Original line number Diff line number Diff line
@@ -111,7 +111,8 @@ ChromeUtils.defineESModuleGetters(this, { 
  TorConnectStage: "resource://gre/modules/TorConnect.sys.mjs",

  TorConnectTopics: "resource://gre/modules/TorConnect.sys.mjs",

  TorConnectParent: "resource:///actors/TorConnectParent.sys.mjs",

  TorDomainIsolator: "resource://gre/modules/TorDomainIsolator.sys.mjs",

  TorDomainIsolator:

    "moz-src:///toolkit/components/tor-launcher/TorDomainIsolator.sys.mjs",

  TorUIUtils: "moz-src:///browser/modules/TorUIUtils.sys.mjs",

  TranslationsParent: "resource://gre/actors/TranslationsParent.sys.mjs",

  UITour: "moz-src:///browser/components/uitour/UITour.sys.mjs",

mobile/shared/components/geckoview/GeckoViewStartup.sys.mjs

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ ChromeUtils.defineESModuleGetters(lazy, { 
  RFPHelper: "resource://gre/modules/RFPHelper.sys.mjs",

  TorAndroidIntegration:

    "moz-src:///toolkit/modules/TorAndroidIntegration.sys.mjs",

  TorDomainIsolator: "resource://gre/modules/TorDomainIsolator.sys.mjs",

  TorDomainIsolator:

    "moz-src:///toolkit/components/tor-launcher/TorDomainIsolator.sys.mjs",

});



const { debug, warn } = GeckoViewUtils.initLogging("Startup");

toolkit/components/tor-launcher/TorDomainIsolator.sys.mjs

+4 −2
Original line number Diff line number Diff line
@@ -13,8 +13,10 @@ const lazy = {}; 


ChromeUtils.defineESModuleGetters(lazy, {

  ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",

  TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs",

  TorProviderTopics: "resource://gre/modules/TorProviderBuilder.sys.mjs",

  TorProviderBuilder:

    "moz-src:///toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs",

  TorProviderTopics:

    "moz-src:///toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs",

});



XPCOMUtils.defineLazyServiceGetters(lazy, {

toolkit/components/tor-launcher/TorStartupService.sys.mjs

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ const lazy = {}; 
// loading

ChromeUtils.defineESModuleGetters(lazy, {

  TorConnect: "resource://gre/modules/TorConnect.sys.mjs",

  TorDomainIsolator: "resource://gre/modules/TorDomainIsolator.sys.mjs",

  TorDomainIsolator:

    "moz-src:///toolkit/components/tor-launcher/TorDomainIsolator.sys.mjs",

  TorLauncherUtil:

    "moz-src:///toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs",

  TorProviderBuilder:

toolkit/components/tor-launcher/moz.build

+1 −4
Original line number Diff line number Diff line 
EXTRA_JS_MODULES += [

    "TorDomainIsolator.sys.mjs",

]



MOZ_SRC_FILES += [

    "TorBootstrapRequest.sys.mjs",

    "TorControlPort.sys.mjs",

    "TorDomainIsolator.sys.mjs",

    "TorLauncherUtil.sys.mjs",

    "TorParsers.sys.mjs",

    "TorProcess.sys.mjs",