From 0647850ec71c0ed4a3390a1f70bcfdea0628a8ec Mon Sep 17 00:00:00 2001
From: Malini Das <mdas@mozilla.com>
Date: Thu, 12 Jul 2012 11:01:20 -0400
Subject: [PATCH] Bug 771224 - use chrome:// instead of loading remote xul.
 r=jgriffin

---
 testing/marionette/Makefile.in                             | 4 ++++
 .../marionette/client/marionette/{www => chrome}/test.xul  | 4 ++--
 .../marionette/client/marionette/{www => chrome}/test2.xul | 0
 .../marionette/{www => chrome}/test_nested_iframe.xul      | 0
 testing/marionette/client/marionette/geckoinstance.py      | 3 +--
 .../marionette/client/marionette/tests/unit/test_click.py  | 7 +------
 .../client/marionette/tests/unit/test_elementState.py      | 7 +------
 .../client/marionette/tests/unit/test_findelement.py       | 7 +------
 .../client/marionette/tests/unit/test_getattr.py           | 7 +------
 .../client/marionette/tests/unit/test_selected.py          | 7 +------
 .../client/marionette/tests/unit/test_switch_frame.py      | 7 +------
 .../marionette/client/marionette/tests/unit/test_text.py   | 7 +------
 testing/marionette/jar.mn                                  | 5 +++++
 13 files changed, 19 insertions(+), 46 deletions(-)
 rename testing/marionette/client/marionette/{www => chrome}/test.xul (78%)
 rename testing/marionette/client/marionette/{www => chrome}/test2.xul (100%)
 rename testing/marionette/client/marionette/{www => chrome}/test_nested_iframe.xul (100%)

diff --git a/testing/marionette/Makefile.in b/testing/marionette/Makefile.in
index 87715034b70c..3133f75cf6c1 100644
--- a/testing/marionette/Makefile.in
+++ b/testing/marionette/Makefile.in
@@ -15,4 +15,8 @@ ifdef ENABLE_MARIONETTE
             $(NULL)
 endif
 
+ifdef ENABLE_TESTS
+    DEFINES += -DENABLE_TESTS
+endif
+
 include $(topsrcdir)/config/rules.mk
diff --git a/testing/marionette/client/marionette/www/test.xul b/testing/marionette/client/marionette/chrome/test.xul
similarity index 78%
rename from testing/marionette/client/marionette/www/test.xul
rename to testing/marionette/client/marionette/chrome/test.xul
index 3980b3506db6..3b0203d090c1 100644
--- a/testing/marionette/client/marionette/www/test.xul
+++ b/testing/marionette/client/marionette/chrome/test.xul
@@ -16,6 +16,6 @@
     <textbox id="textInput3" class="asdf" size="6" value="test" label="input" />
   </vbox>
      
-  <iframe id="iframe" name="iframename" src="test2.xul"/>
-  <iframe id="iframe" name="iframename" src="test_nested_iframe.xul"/>
+  <iframe id="iframe" name="iframename" src="chrome://marionette/content/test2.xul"/>
+  <iframe id="iframe" name="iframename" src="chrome://marionette/content/test_nested_iframe.xul"/>
 </dialog>
diff --git a/testing/marionette/client/marionette/www/test2.xul b/testing/marionette/client/marionette/chrome/test2.xul
similarity index 100%
rename from testing/marionette/client/marionette/www/test2.xul
rename to testing/marionette/client/marionette/chrome/test2.xul
diff --git a/testing/marionette/client/marionette/www/test_nested_iframe.xul b/testing/marionette/client/marionette/chrome/test_nested_iframe.xul
similarity index 100%
rename from testing/marionette/client/marionette/www/test_nested_iframe.xul
rename to testing/marionette/client/marionette/chrome/test_nested_iframe.xul
diff --git a/testing/marionette/client/marionette/geckoinstance.py b/testing/marionette/client/marionette/geckoinstance.py
index d8b6145623ed..6391920752ce 100644
--- a/testing/marionette/client/marionette/geckoinstance.py
+++ b/testing/marionette/client/marionette/geckoinstance.py
@@ -20,8 +20,7 @@ class GeckoInstance(object):
     def start(self):
         profile = self.profile
         if not profile:
-            prefs = {"dom.allow_XUL_XBL_for_file": True,
-                     "marionette.defaultPrefs.enabled": True,
+            prefs = {"marionette.defaultPrefs.enabled": True,
                      "marionette.defaultPrefs.port": 2828}
             profile = {"preferences": prefs, "restore":False}
         print "starting runner"
diff --git a/testing/marionette/client/marionette/tests/unit/test_click.py b/testing/marionette/client/marionette/tests/unit/test_click.py
index 3c5aeec653a2..7c7b19d3d4c9 100644
--- a/testing/marionette/client/marionette/tests/unit/test_click.py
+++ b/testing/marionette/client/marionette/tests/unit/test_click.py
@@ -24,12 +24,7 @@ class TestClickChrome(MarionetteTestCase):
         MarionetteTestCase.setUp(self)
         self.marionette.set_context("chrome")
         self.win = self.marionette.get_window()
-        #need to get the file:// path for xul
-        unit = os.path.abspath(os.path.join(os.path.realpath(__file__), os.path.pardir))
-        tests = os.path.abspath(os.path.join(unit, os.path.pardir))
-        mpath = os.path.abspath(os.path.join(tests, os.path.pardir))
-        xul = "file://" + os.path.join(mpath, "www", "test.xul")
-        self.marionette.execute_script("window.open('" + xul +"', '_blank', 'chrome,centerscreen');")
+        self.marionette.execute_script("window.open('chrome://marionette/content/test.xul', '_blank', 'chrome,centerscreen');")
 
     def tearDown(self):
         self.marionette.execute_script("window.close();")
diff --git a/testing/marionette/client/marionette/tests/unit/test_elementState.py b/testing/marionette/client/marionette/tests/unit/test_elementState.py
index d3d25a1eab00..a062ef4dc30e 100644
--- a/testing/marionette/client/marionette/tests/unit/test_elementState.py
+++ b/testing/marionette/client/marionette/tests/unit/test_elementState.py
@@ -27,12 +27,7 @@ class TestStateChrome(MarionetteTestCase):
         MarionetteTestCase.setUp(self)
         self.marionette.set_context("chrome")
         self.win = self.marionette.get_window()
-        #need to get the file:// path for xul
-        unit = os.path.abspath(os.path.join(os.path.realpath(__file__), os.path.pardir))
-        tests = os.path.abspath(os.path.join(unit, os.path.pardir))
-        mpath = os.path.abspath(os.path.join(tests, os.path.pardir))
-        xul = "file://" + os.path.join(mpath, "www", "test.xul")
-        self.marionette.execute_script("window.open('" + xul +"', '_blank', 'chrome,centerscreen');")
+        self.marionette.execute_script("window.open('chrome://marionette/content/test.xul', '_blank', 'chrome,centerscreen');")
 
     def tearDown(self):
         self.marionette.execute_script("window.close();")
diff --git a/testing/marionette/client/marionette/tests/unit/test_findelement.py b/testing/marionette/client/marionette/tests/unit/test_findelement.py
index 04c43d10b92a..213d8061a3a0 100644
--- a/testing/marionette/client/marionette/tests/unit/test_findelement.py
+++ b/testing/marionette/client/marionette/tests/unit/test_findelement.py
@@ -128,12 +128,7 @@ class TestElementsChrome(MarionetteTestCase):
         MarionetteTestCase.setUp(self)
         self.marionette.set_context("chrome")
         self.win = self.marionette.get_window()
-        #need to get the file:// path for xul
-        unit = os.path.abspath(os.path.join(os.path.realpath(__file__), os.path.pardir))
-        tests = os.path.abspath(os.path.join(unit, os.path.pardir))
-        mpath = os.path.abspath(os.path.join(tests, os.path.pardir))
-        xul = "file://" + os.path.join(mpath, "www", "test.xul")
-        self.marionette.execute_script("window.open('" + xul +"', '_blank', 'chrome,centerscreen');")
+        self.marionette.execute_script("window.open('chrome://marionette/content/test.xul', '_blank', 'chrome,centerscreen');")
 
     def tearDown(self):
         self.marionette.execute_script("window.close();")
diff --git a/testing/marionette/client/marionette/tests/unit/test_getattr.py b/testing/marionette/client/marionette/tests/unit/test_getattr.py
index 3420df380e55..a6d1b17e0310 100644
--- a/testing/marionette/client/marionette/tests/unit/test_getattr.py
+++ b/testing/marionette/client/marionette/tests/unit/test_getattr.py
@@ -17,12 +17,7 @@ class TestGetAttributeChrome(MarionetteTestCase):
         MarionetteTestCase.setUp(self)
         self.marionette.set_context("chrome")
         self.win = self.marionette.get_window()
-        #need to get the file:// path for xul
-        unit = os.path.abspath(os.path.join(os.path.realpath(__file__), os.path.pardir))
-        tests = os.path.abspath(os.path.join(unit, os.path.pardir))
-        mpath = os.path.abspath(os.path.join(tests, os.path.pardir))
-        xul = "file://" + os.path.join(mpath, "www", "test.xul")
-        self.marionette.execute_script("window.open('" + xul +"', '_blank', 'chrome,centerscreen');")
+        self.marionette.execute_script("window.open('chrome://marionette/content/test.xul', '_blank', 'chrome,centerscreen');")
 
     def tearDown(self):
         self.marionette.execute_script("window.close();")
diff --git a/testing/marionette/client/marionette/tests/unit/test_selected.py b/testing/marionette/client/marionette/tests/unit/test_selected.py
index f7158aa7369b..97a241ea874d 100644
--- a/testing/marionette/client/marionette/tests/unit/test_selected.py
+++ b/testing/marionette/client/marionette/tests/unit/test_selected.py
@@ -19,12 +19,7 @@ class TestSelectedChrome(MarionetteTestCase):
         MarionetteTestCase.setUp(self)
         self.marionette.set_context("chrome")
         self.win = self.marionette.get_window()
-        #need to get the file:// path for xul
-        unit = os.path.abspath(os.path.join(os.path.realpath(__file__), os.path.pardir))
-        tests = os.path.abspath(os.path.join(unit, os.path.pardir))
-        mpath = os.path.abspath(os.path.join(tests, os.path.pardir))
-        xul = "file://" + os.path.join(mpath, "www", "test.xul")
-        self.marionette.execute_script("window.open('" + xul +"', '_blank', 'chrome,centerscreen');")
+        self.marionette.execute_script("window.open('chrome://marionette/content/test.xul', '_blank', 'chrome,centerscreen');")
 
     def tearDown(self):
         self.marionette.execute_script("window.close();")
diff --git a/testing/marionette/client/marionette/tests/unit/test_switch_frame.py b/testing/marionette/client/marionette/tests/unit/test_switch_frame.py
index f93da51288e4..69ea6ea33ca9 100644
--- a/testing/marionette/client/marionette/tests/unit/test_switch_frame.py
+++ b/testing/marionette/client/marionette/tests/unit/test_switch_frame.py
@@ -37,12 +37,7 @@ class TestSwitchFrameChrome(MarionetteTestCase):
         MarionetteTestCase.setUp(self)
         self.marionette.set_context("chrome")
         self.win = self.marionette.get_window()
-        #need to get the file:// path for xul
-        unit = os.path.abspath(os.path.join(os.path.realpath(__file__), os.path.pardir))
-        tests = os.path.abspath(os.path.join(unit, os.path.pardir))
-        mpath = os.path.abspath(os.path.join(tests, os.path.pardir))
-        xul = "file://" + os.path.join(mpath, "www", "test.xul")
-        self.marionette.execute_script("window.open('" + xul +"', '_blank', 'chrome,centerscreen');")
+        self.marionette.execute_script("window.open('chrome://marionette/content/test.xul', '_blank', 'chrome,centerscreen');")
 
     def tearDown(self):
         self.marionette.execute_script("window.close();")
diff --git a/testing/marionette/client/marionette/tests/unit/test_text.py b/testing/marionette/client/marionette/tests/unit/test_text.py
index 59292e55ed16..6e793e3344bd 100644
--- a/testing/marionette/client/marionette/tests/unit/test_text.py
+++ b/testing/marionette/client/marionette/tests/unit/test_text.py
@@ -33,12 +33,7 @@ class TestTextChrome(MarionetteTestCase):
         MarionetteTestCase.setUp(self)
         self.marionette.set_context("chrome")
         self.win = self.marionette.get_window()
-        #need to get the file:// path for xul
-        unit = os.path.abspath(os.path.join(os.path.realpath(__file__), os.path.pardir))
-        tests = os.path.abspath(os.path.join(unit, os.path.pardir))
-        mpath = os.path.abspath(os.path.join(tests, os.path.pardir))
-        xul = "file://" + os.path.join(mpath, "www", "test.xul")
-        self.marionette.execute_script("window.open('" + xul +"', '_blank', 'chrome,centerscreen');")
+        self.marionette.execute_script("window.open('chrome://marionette/content/test.xul', '_blank', 'chrome,centerscreen');")
 
     def tearDown(self):
         self.marionette.execute_script("window.close();")
diff --git a/testing/marionette/jar.mn b/testing/marionette/jar.mn
index c343a6d0403e..1c287732ea07 100644
--- a/testing/marionette/jar.mn
+++ b/testing/marionette/jar.mn
@@ -12,6 +12,11 @@ marionette.jar:
   content/marionette-perf.js  (marionette-perf.js)
   content/EventUtils.js  (EventUtils.js)
   content/ChromeUtils.js  (ChromeUtils.js)
+#ifdef ENABLE_TESTS
+  content/test.xul  (client/marionette/chrome/test.xul)
+  content/test2.xul  (client/marionette/chrome/test2.xul)
+  content/test_nested_iframe.xul  (client/marionette/chrome/test_nested_iframe.xul)
+#endif
 
 % content specialpowers %content/
   content/specialpowers.js (../mochitest/specialpowers/content/specialpowers.js)