Bug 842198 - Move browser_bug822367.js test to browser/, r=tanvi

--HG--
rename : content/base/test/chrome/browser_bug822367.js => browser/base/content/test/browser_bug822367.js
rename : content/base/test/file_bug822367_1.html => browser/base/content/test/file_bug822367_1.html
rename : content/base/test/file_bug822367_1.js => browser/base/content/test/file_bug822367_1.js
rename : content/base/test/file_bug822367_2.html => browser/base/content/test/file_bug822367_2.html
rename : content/base/test/file_bug822367_3.html => browser/base/content/test/file_bug822367_3.html
rename : content/base/test/file_bug822367_4.html => browser/base/content/test/file_bug822367_4.html
rename : content/base/test/file_bug822367_4.js => browser/base/content/test/file_bug822367_4.js
rename : content/base/test/file_bug822367_4B.html => browser/base/content/test/file_bug822367_4B.html
rename : content/base/test/file_bug822367_5.html => browser/base/content/test/file_bug822367_5.html
rename : content/base/test/file_bug822367_6.html => browser/base/content/test/file_bug822367_6.html

browser/base/content/test/Makefile.in

@@ -161,6 +161,7 @@ _BROWSER_FILES = \
                  browser_bug783614.js \
                  browser_bug797677.js \
                  browser_bug816527.js \
+                 browser_bug822367.js \
                  browser_bug832435.js \
                  browser_canonizeURL.js \
                  browser_customize.js \
@@ -237,6 +238,15 @@ _BROWSER_FILES = \
                  disablechrome.html \
                  discovery.html \
                  domplate_test.js \
+                 file_bug822367_1.html \
+                 file_bug822367_1.js \
+                 file_bug822367_2.html \
+                 file_bug822367_3.html \
+                 file_bug822367_4.html \
+                 file_bug822367_4.js \
+                 file_bug822367_4B.html \
+                 file_bug822367_5.html \
+                 file_bug822367_6.html \
                  moz.png \
                  video.ogg \
                  test_bug435035.html \

browser/base/content/test/browser_bug822367.js

@@ -5,7 +5,7 @@
 
 const PREF_DISPLAY = "security.mixed_content.block_display_content";
 const PREF_ACTIVE = "security.mixed_content.block_active_content";
-const gHttpTestRoot = "https://example.com/tests/content/base/test/";
+const gHttpTestRoot = "https://example.com/browser/browser/base/content/test/";
 var origBlockDisplay;
 var origBlockActive;
 var gTestBrowser = null;

browser/base/content/test/file_bug822367_1.html

@@ -12,7 +12,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822367
   <div id="testContent">
     <p id="p1"></p>
   </div>
-  <script src="http://example.com/tests/content/base/test/file_bug822367_1.js">
+  <script src="http://example.com/browser/browser/base/content/test/file_bug822367_1.js">
   </script>
 </body>
 </html>

browser/base/content/test/file_bug822367_3.html

@@ -21,7 +21,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822367
     <p id="p1"></p>
     <img src="http://example.com/tests/image/test/mochitest/blue.png" onload="foo()">
   </div>
-  <script src="http://example.com/tests/content/base/test/file_bug822367_1.js">
+  <script src="http://example.com/browser/browser/base/content/test/file_bug822367_1.js">
   </script>
 </body>
 </html>

browser/base/content/test/file_bug822367_4.html

@@ -12,7 +12,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822367
   <div id="testContent">
     <p id="p1"></p>
   </div>
-  <script src="http://example.com/tests/content/base/test/file_bug822367_4.js">
+  <script src="http://example.com/browser/browser/base/content/test/file_bug822367_4.js">
   </script>
 </body>
 </html>

browser/base/content/test/file_bug822367_4.js

@@ -0,0 +1 @@
+document.location = "https://example.com/browser/browser/base/content/test/file_bug822367_4B.html";

browser/base/content/test/file_bug822367_4B.html

@@ -12,7 +12,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822367
   <div id="testContent">
     <p id="p1"></p>
   </div>
-  <script src="http://example.com/tests/content/base/test/file_bug822367_1.js">
+  <script src="http://example.com/browser/browser/base/content/test/file_bug822367_1.js">
   </script>
 </body>
 </html>

browser/base/content/test/file_bug822367_5.html

@@ -11,7 +11,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822367
     function createDoc()
     {
       var doc=document.open("text/html","replace");
-      doc.write('<!DOCTYPE html><html><body><p id="p1">This is some content</p><script src="http://example.com/tests/content/base/test/file_bug822367_1.js">\<\/script\>\<\/body>\<\/html>');
+      doc.write('<!DOCTYPE html><html><body><p id="p1">This is some content</p><script src="http://example.com/browser/browser/base/content/test/file_bug822367_1.js">\<\/script\>\<\/body>\<\/html>');
       doc.close();
     }
   </script>

browser/base/content/test/file_bug822367_6.html

@@ -10,7 +10,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822367
 </head>
 <body>
   <div id="testContent">
-    <iframe name="f1" id="f1" src="https://example.com/tests/content/base/test/file_bug822367_5.html"></iframe>
+    <iframe name="f1" id="f1" src="https://example.com/browser/browser/base/content/test/file_bug822367_5.html"></iframe>
   </div>
 </body>
 </html>

content/base/test/Makefile.in

@@ -613,15 +613,6 @@ MOCHITEST_FILES_C= \
     test_mixed_content_blocker_bug803225.html \
     file_mixed_content_main_bug803225.html \
     file_mixed_content_main_bug803225_websocket_wsh.py \
-    file_bug822367_1.html \
-    file_bug822367_1.js \
-    file_bug822367_2.html \
-    file_bug822367_3.html \
-    file_bug822367_4.html \
-    file_bug822367_4.js \
-    file_bug822367_4B.html \
-    file_bug822367_5.html \
-    file_bug822367_6.html \
     bug803225_test_mailto.html \
 		test_bug789856.html \
 		file_bug804395.jar \

content/base/test/chrome/Makefile.in

@@ -57,7 +57,4 @@ MOCHITEST_CHROME_FILES = \
     frame_bug814638.xul \
     $(NULL)
 
-MOCHITEST_BROWSER_FILES = \
-    browser_bug822367.js \
-
 include $(topsrcdir)/config/rules.mk

content/base/test/file_bug822367_4.js

@@ -1 +0,0 @@
-document.location = "https://example.com/tests/content/base/test/file_bug822367_4B.html";