From 87ffcf52fee9a1271b0ab3c6cd5c58d65dd1a8e7 Mon Sep 17 00:00:00 2001
From: Yoshi Huang <allstars.chh@mozilla.com>
Date: Fri, 12 May 2017 11:38:40 +0800
Subject: [PATCH] Bug 1363612 - Part 3: fix for moz-binding: url. r=smaug

Also seperate this to make sure I modified the test correctly.
---
 dom/base/test/file_bug372086.xml  |  2 ++
 dom/base/test/mochitest.ini       |  1 +
 dom/base/test/test_bug372086.html |  2 +-
 dom/xbl/test/file_bug366770.xml   | 14 ++++++++++++++
 dom/xbl/test/mochitest.ini        |  1 +
 dom/xbl/test/test_bug366770.html  | 19 +------------------
 6 files changed, 20 insertions(+), 19 deletions(-)
 create mode 100644 dom/base/test/file_bug372086.xml
 create mode 100644 dom/xbl/test/file_bug366770.xml

diff --git a/dom/base/test/file_bug372086.xml b/dom/base/test/file_bug372086.xml
new file mode 100644
index 000000000000..e8c8badcd4ec
--- /dev/null
+++ b/dom/base/test/file_bug372086.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<bindings xmlns="http://www.mozilla.org/xbl"><binding id="test"><content>ghi<children/>jkl</content></binding></bindings>
diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini
index cce500d02727..01a0931f8467 100644
--- a/dom/base/test/mochitest.ini
+++ b/dom/base/test/mochitest.ini
@@ -69,6 +69,7 @@ support-files =
   file_bug326337.xml
   file_bug326337_inner.html
   file_bug326337_outer.html
+  file_bug372086.xml
   file_bug416317.xhtml
   file_bug426646-1.html
   file_bug426646-2.html
diff --git a/dom/base/test/test_bug372086.html b/dom/base/test/test_bug372086.html
index 75bf1a541711..2dc5b52a1d3b 100644
--- a/dom/base/test/test_bug372086.html
+++ b/dom/base/test/test_bug372086.html
@@ -18,7 +18,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=372086
          </binding>
        </bindings>
     -->
-  <div id="d" style="-moz-binding: url(data:application/xml,%3Cbindings%20xmlns%3D%22http%3A%2F%2Fwww.mozilla.org%2Fxbl%22%3E%3Cbinding%20id%3D%22test%22%3E%3Ccontent%3Eghi%3Cchildren%2F%3Ejkl%3C%2Fcontent%3E%3C%2Fbinding%3E%3C%2Fbindings%3E)">abc</div>def
+  <div id="d" style="-moz-binding: url(file_bug372086.xml)">abc</div>def
 </p>
 <div id="content" style="display: none">
   
diff --git a/dom/xbl/test/file_bug366770.xml b/dom/xbl/test/file_bug366770.xml
new file mode 100644
index 000000000000..11408ec46a5d
--- /dev/null
+++ b/dom/xbl/test/file_bug366770.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<bindings id="xbltestBindings" xmlns="http://www.mozilla.org/xbl">
+  <binding id="xbltest">
+    <content>PASS</content>
+    <implementation>
+      <constructor>
+        var win = XPCNativeWrapper.unwrap(window);
+        win.document.bindingConstructorRan = true;
+        win.ok(true, "binding URI with no fragment applied");
+        win.SimpleTest.finish();
+      </constructor>
+    </implementation>
+  </binding>
+</bindings>
diff --git a/dom/xbl/test/mochitest.ini b/dom/xbl/test/mochitest.ini
index 2adb0723cb39..8d0bd3b92b76 100644
--- a/dom/xbl/test/mochitest.ini
+++ b/dom/xbl/test/mochitest.ini
@@ -2,6 +2,7 @@
 support-files =
   bug310107-resource.xhtml
   file_bug310107.html
+  file_bug366770.xml
   file_bug372769.xhtml
   file_bug379959_cross.html
   file_bug379959_data.html
diff --git a/dom/xbl/test/test_bug366770.html b/dom/xbl/test/test_bug366770.html
index d3314ecca4d2..9eb84936a4cb 100644
--- a/dom/xbl/test/test_bug366770.html
+++ b/dom/xbl/test/test_bug366770.html
@@ -12,24 +12,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=366770
   <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=366770">Mozilla Bug 366770</a>
   <p id="display"></p>
   <div id="content" style="display: none"></div>
-
-  <!-- data: URI below corresponds to:
-  <?xml version="1.0"?>
-  <bindings id="xbltestBindings" xmlns="http://www.mozilla.org/xbl">
-    <binding id="xbltest">
-      <content>PASS</content>
-      <implementation>
-        <constructor>
-          var win = XPCNativeWrapper.unwrap(window);
-          win.document.bindingConstructorRan = true;
-          win.ok(true, "binding URI with no fragment applied");
-          win.SimpleTest.finish();
-        </constructor>
-      </implementation>
-    </binding>
-  </bindings>
-  -->
-  <span id="span" style="-moz-binding: url(data:text/xml;base64,ICA8YmluZGluZ3MgaWQ9InhibHRlc3RCaW5kaW5ncyIgeG1sbnM9Imh0dHA6Ly93d3cubW96aWxsYS5vcmcveGJsIj4KICAgIDxiaW5kaW5nIGlkPSJ4Ymx0ZXN0Ij4KICAgICAgPGNvbnRlbnQ+UEFTUzwvY29udGVudD4KICAgICAgPGltcGxlbWVudGF0aW9uPgogICAgICAgIDxjb25zdHJ1Y3Rvcj4KICAgICAgICAgIHZhciB3aW4gPSBYUENOYXRpdmVXcmFwcGVyLnVud3JhcCh3aW5kb3cpOwogICAgICAgICAgd2luLmRvY3VtZW50LmJpbmRpbmdDb25zdHJ1Y3RvclJhbiA9IHRydWU7CiAgICAgICAgICB3aW4ub2sodHJ1ZSwgImJpbmRpbmcgVVJJIHdpdGggbm8gZnJhZ21lbnQgYXBwbGllZCIpOwogICAgICAgICAgd2luLlNpbXBsZVRlc3QuZmluaXNoKCk7CiAgICAgICAgPC9jb25zdHJ1Y3Rvcj4KICAgICAgPC9pbXBsZW1lbnRhdGlvbj4KICAgIDwvYmluZGluZz4KICA8L2JpbmRpbmdzPg==);"></span>
+  <span id="span" style="-moz-binding: url(file_bug366770.xml);"></span>
 
   <pre id="test">
     <script class="testbody" type="text/javascript">