Bug 842198 - Move browser_bug822367.js test to browser/, r=tanvi
authorFrank Wein <mcsmurf@mcsmurf.de>
Wed, 20 Feb 2013 09:54:49 +0100
changeset 122432 111c835cedf670a1672b12f6d2d764b0e621c2e9
parent 122431 9058fd42c73414fce7f16f83be95ceedd59343b3
child 122433 c60c5b83e9bbb39c48c56af6ece100a361eaa6c0
push id24342
push userryanvm@gmail.com
push dateThu, 21 Feb 2013 13:05:06 +0000
treeherdermozilla-central@702d2814efbf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstanvi
bugs842198, 822367
milestone22.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 842198 - Move browser_bug822367.js test to browser/, r=tanvi
browser/base/content/test/Makefile.in
browser/base/content/test/browser_bug822367.js
browser/base/content/test/file_bug822367_1.html
browser/base/content/test/file_bug822367_1.js
browser/base/content/test/file_bug822367_2.html
browser/base/content/test/file_bug822367_3.html
browser/base/content/test/file_bug822367_4.html
browser/base/content/test/file_bug822367_4.js
browser/base/content/test/file_bug822367_4B.html
browser/base/content/test/file_bug822367_5.html
browser/base/content/test/file_bug822367_6.html
content/base/test/Makefile.in
content/base/test/chrome/Makefile.in
content/base/test/chrome/browser_bug822367.js
content/base/test/file_bug822367_1.html
content/base/test/file_bug822367_1.js
content/base/test/file_bug822367_2.html
content/base/test/file_bug822367_3.html
content/base/test/file_bug822367_4.html
content/base/test/file_bug822367_4.js
content/base/test/file_bug822367_4B.html
content/base/test/file_bug822367_5.html
content/base/test/file_bug822367_6.html
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -156,16 +156,17 @@ endif
                  browser_bug735471.js \
                  browser_bug743421.js \
                  browser_bug749738.js \
                  browser_bug763468_perwindowpb.js \
                  browser_bug767836_perwindowpb.js \
                  browser_bug783614.js \
                  browser_bug797677.js \
                  browser_bug816527.js \
+                 browser_bug822367.js \
                  browser_bug832435.js \
                  browser_canonizeURL.js \
                  browser_customize.js \
                  browser_findbarClose.js \
                  browser_homeDrop.js \
                  browser_keywordBookmarklets.js \
                  browser_contextSearchTabPosition.js \
                  browser_ctrlTab.js \
@@ -232,16 +233,25 @@ endif
                  browser_visibleTabs_contextMenu.js \
                  browser_visibleTabs_bookmarkAllPages.js \
                  browser_visibleTabs_bookmarkAllTabs.js \
                  browser_visibleTabs_tabPreview.js \
                  bug592338.html \
                  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 \
                  test_bug462673.html \
                  page_style_sample.html \
                  plugin_unknown.html \
                  plugin_test.html \
                  plugin_test2.html \
rename from content/base/test/chrome/browser_bug822367.js
rename to browser/base/content/test/browser_bug822367.js
--- a/content/base/test/chrome/browser_bug822367.js
+++ b/browser/base/content/test/browser_bug822367.js
@@ -1,16 +1,16 @@
 /*
  * User Override Mixed Content Block - Tests for Bug 822367
  */
 
 
 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;
 
 registerCleanupFunction(function() {
   // Set preferences back to their original values
   Services.prefs.setBoolPref(PREF_DISPLAY, origBlockDisplay);
   Services.prefs.setBoolPref(PREF_ACTIVE, origBlockActive);
rename from content/base/test/file_bug822367_1.html
rename to browser/base/content/test/file_bug822367_1.html
--- a/content/base/test/file_bug822367_1.html
+++ b/browser/base/content/test/file_bug822367_1.html
@@ -7,12 +7,12 @@ https://bugzilla.mozilla.org/show_bug.cg
 <head>
   <meta charset="utf-8">
   <title>Test 1 for Bug 822367</title>
 </head>
 <body>
   <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>
rename from content/base/test/file_bug822367_1.js
rename to browser/base/content/test/file_bug822367_1.js
rename from content/base/test/file_bug822367_2.html
rename to browser/base/content/test/file_bug822367_2.html
rename from content/base/test/file_bug822367_3.html
rename to browser/base/content/test/file_bug822367_3.html
--- a/content/base/test/file_bug822367_3.html
+++ b/browser/base/content/test/file_bug822367_3.html
@@ -16,12 +16,12 @@ https://bugzilla.mozilla.org/show_bug.cg
   }
   </script>
 </head>
 <body>
   <div id="testContent">
     <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>
rename from content/base/test/file_bug822367_4.html
rename to browser/base/content/test/file_bug822367_4.html
--- a/content/base/test/file_bug822367_4.html
+++ b/browser/base/content/test/file_bug822367_4.html
@@ -7,12 +7,12 @@ https://bugzilla.mozilla.org/show_bug.cg
 <head>
   <meta charset="utf-8">
   <title>Test 4 for Bug 822367</title>
 </head>
 <body>
   <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>
rename from content/base/test/file_bug822367_4.js
rename to browser/base/content/test/file_bug822367_4.js
--- a/content/base/test/file_bug822367_4.js
+++ b/browser/base/content/test/file_bug822367_4.js
@@ -1,1 +1,1 @@
-document.location = "https://example.com/tests/content/base/test/file_bug822367_4B.html";
+document.location = "https://example.com/browser/browser/base/content/test/file_bug822367_4B.html";
rename from content/base/test/file_bug822367_4B.html
rename to browser/base/content/test/file_bug822367_4B.html
--- a/content/base/test/file_bug822367_4B.html
+++ b/browser/base/content/test/file_bug822367_4B.html
@@ -7,12 +7,12 @@ https://bugzilla.mozilla.org/show_bug.cg
 <head>
   <meta charset="utf-8">
   <title>Test 4B Location Change for Bug 822367</title>
 </head>
 <body>
   <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>
rename from content/base/test/file_bug822367_5.html
rename to browser/base/content/test/file_bug822367_5.html
--- a/content/base/test/file_bug822367_5.html
+++ b/browser/base/content/test/file_bug822367_5.html
@@ -6,17 +6,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 -->
 <head>
   <meta charset="utf-8">
   <title>Test 5 for Bug 822367</title>
   <script>
     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>
 </head>
 <body>
   <div id="testContent">
     <img src="https://example.com/tests/image/test/mochitest/blue.png" onload="createDoc()">
   </div>
rename from content/base/test/file_bug822367_6.html
rename to browser/base/content/test/file_bug822367_6.html
--- a/content/base/test/file_bug822367_6.html
+++ b/browser/base/content/test/file_bug822367_6.html
@@ -5,12 +5,12 @@ Test 6 for Mixed Content Blocker User Ov
 https://bugzilla.mozilla.org/show_bug.cgi?id=822367
 -->
 <head>
   <meta charset="utf-8">
   <title>Test 6 for Bug 822367</title>
 </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>
--- a/content/base/test/Makefile.in
+++ b/content/base/test/Makefile.in
@@ -608,25 +608,16 @@ MOCHITEST_FILES_C= \
 		test_XHR_parameters.html \
 		test_ipc_messagemanager_blob.html \
 		test_mixed_content_blocker.html \
 		file_mixed_content_main.html \
 		file_mixed_content_server.sjs \
     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 \
 		test_bug804395.html \
 		test_bug809003.html \
 		test_bug810494.html \
 		test_bug819051.html \
 		bug819051.sjs \
--- a/content/base/test/chrome/Makefile.in
+++ b/content/base/test/chrome/Makefile.in
@@ -52,12 +52,9 @@ MOCHITEST_CHROME_FILES = \
     test_bug816340.xul \
     file_bug816340.xul \
     test_domparsing.xul \
     test_bug814638.xul \
     host_bug814638.xul \
     frame_bug814638.xul \
     $(NULL)
 
-MOCHITEST_BROWSER_FILES = \
-    browser_bug822367.js \
-
 include $(topsrcdir)/config/rules.mk