From e81fe01221dfb7afa51c0e2e693c3d3779956227 Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Fri, 7 Nov 2014 14:23:05 -0800
Subject: [PATCH] Backed out changesets 156eee9f2d2a,6e5aee097c86 (bug 1094545)
 for bc1 and xpcshell orange on a CLOSED TREE

---
 .../places/PlacesProtocolHandler.js           |  4 +--
 dom/base/test/unit/test_url.js                | 25 -------------------
 dom/base/test/unit/xpcshell.ini               |  1 -
 dom/bindings/Codegen.py                       |  1 -
 dom/webidl/URL.webidl                         |  2 +-
 dom/webidl/URLSearchParams.webidl             |  2 +-
 dom/webidl/URLUtils.webidl                    |  4 +--
 7 files changed, 6 insertions(+), 33 deletions(-)
 delete mode 100644 dom/base/test/unit/test_url.js

diff --git a/browser/components/places/PlacesProtocolHandler.js b/browser/components/places/PlacesProtocolHandler.js
index f3640c9eb62a..4a0d88126f3f 100644
--- a/browser/components/places/PlacesProtocolHandler.js
+++ b/browser/components/places/PlacesProtocolHandler.js
@@ -11,7 +11,7 @@ Components.utils.import("resource://gre/modules/NetUtil.jsm");
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 const SCHEME = "place";
-const OURURL = "chrome://browser/content/places/content-ui/controller.xhtml";
+const URL = "chrome://browser/content/places/content-ui/controller.xhtml";
 
 function PlacesProtocolHandler() {}
 
@@ -30,7 +30,7 @@ PlacesProtocolHandler.prototype = {
   },
 
   newChannel: function PPH_newChannel(aUri) {
-    let chan = NetUtil.newChannel(OURURL);
+    let chan = NetUtil.newChannel(URL);
     chan.originalURI = aUri;
     return chan;
   },
diff --git a/dom/base/test/unit/test_url.js b/dom/base/test/unit/test_url.js
deleted file mode 100644
index 6f7750720f5c..000000000000
--- a/dom/base/test/unit/test_url.js
+++ /dev/null
@@ -1,25 +0,0 @@
-function run_test()
-{
-  var url = new URL('http://www.example.com');
-  do_check_eq(url.href, "http://www.example.com/");
-
-  var url2 = new URL('/foobar', url);
-  do_check_eq(url2.href, "http://www.example.com/foobar");
-
-  // Blob is not exposed in xpcshell yet, but when it is we should
-  // reenable the Blob bits here.
-  do_check_false("Blob" in this)
-
-  /*
-  var blob = new Blob(['a']);
-  var url = URL.createObjectURL(blob);
-  ok(url, "URL is created!");
-
-  var u = new URL(url);
-  ok(u, "URL created");
-  is(u.origin, "null", "Url doesn't have an origin if created in a JSM");
-
-  URL.revokeObjectURL(url);
-  ok(true, "URL is revoked");
-  */
-}
diff --git a/dom/base/test/unit/xpcshell.ini b/dom/base/test/unit/xpcshell.ini
index ebc2ed8b90d5..3d913b0b339e 100644
--- a/dom/base/test/unit/xpcshell.ini
+++ b/dom/base/test/unit/xpcshell.ini
@@ -29,7 +29,6 @@ run-sequentially = Hardcoded 4444 port.
 # Bug 1018414: hardcoded localhost doesn't work properly on some OS X installs
 skip-if = os == 'mac'
 [test_thirdpartyutil.js]
-[test_url.js]
 [test_xhr_document.js]
 [test_xhr_standalone.js]
 [test_xmlserializer.js]
diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index 8073f6e8896e..10502dac1421 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -11888,7 +11888,6 @@ class CGResolveSystemBinding(CGAbstractMethod):
     def definition_body(self):
         descriptors = self.config.getDescriptors(hasInterfaceObject=True,
                                                  isExposedInSystemGlobals=True,
-                                                 workers=False,
                                                  register=True,
                                                  skipGen=False)
 
diff --git a/dom/webidl/URL.webidl b/dom/webidl/URL.webidl
index 8e6f1bd3b988..7fe970104372 100644
--- a/dom/webidl/URL.webidl
+++ b/dom/webidl/URL.webidl
@@ -15,7 +15,7 @@
 // [Constructor(DOMString url, optional (URL or DOMString) base = "about:blank")]
 [Constructor(DOMString url, URL base),
  Constructor(DOMString url, optional DOMString base = "about:blank"),
- Exposed=(Window,Worker,System)]
+ Exposed=(Window,Worker)]
 interface URL {
 };
 URL implements URLUtils;
diff --git a/dom/webidl/URLSearchParams.webidl b/dom/webidl/URLSearchParams.webidl
index 87ba820b213a..c2dade09a09d 100644
--- a/dom/webidl/URLSearchParams.webidl
+++ b/dom/webidl/URLSearchParams.webidl
@@ -15,7 +15,7 @@
 
 [Constructor(optional ScalarValueString init = ""),
  Constructor(URLSearchParams init),
- Exposed=(Window,Worker,System)]
+ Exposed=(Window,Worker)]
 interface URLSearchParams {
   void append(ScalarValueString name, ScalarValueString value);
   void delete(ScalarValueString name);
diff --git a/dom/webidl/URLUtils.webidl b/dom/webidl/URLUtils.webidl
index 1ef270460f9b..8cd0534c463f 100644
--- a/dom/webidl/URLUtils.webidl
+++ b/dom/webidl/URLUtils.webidl
@@ -14,7 +14,7 @@
  */
 
 [NoInterfaceObject,
- Exposed=(Window, Worker,System)]
+ Exposed=(Window, Worker)]
 interface URLUtils {
   // Bug 824857: no support for stringifier attributes yet.
   //  stringifier attribute ScalarValueString href;
@@ -49,7 +49,7 @@ interface URLUtils {
 };
 
 [NoInterfaceObject,
- Exposed=(Window, Worker, System)]
+ Exposed=(Window, Worker)]
 interface URLUtilsSearchParams {
            attribute URLSearchParams searchParams;
 };