     currentURI = @browser.currentURI
     return true if currentURI is null and uri is null
 
-    wesabe.untaint(@url) is wesabe.untaint(@joinURI uri)
+    privacy.untaint(@url) is privacy.untaint(@joinURI uri)
 
   @wrap: (browser) ->
     if type.is browser, @

  go: (uri) ->
    uri = @joinURI uri
    logger.debug 'Loading uri=', uri
    @browser.loadURI wesabe.untaint(uri), null, null

  #
  # Get the absolute uri by joining +uri+ to the current uri of +browser+.
  # +uri+ may be either relative or absolute.
  #
  joinURI: (uri) ->
    uri = wesabe.untaint uri
    uri = @browser.currentURI?.resolve uri

    wesabe.taint uri

  #
  # Determines whether browser is currently at +uri+,

  # Get the current uri of browser as a string.
  #
  @::__defineGetter__ 'url', ->
    privacy.taint @browser.currentURI?.resolve(null)

  #
  # Proxy addEventListener through so that event.add will work.
