Bug 1547397 - Part 1: Move some mochitests and browser-chrome tests for cookies out of extensions/cookies; r=baku
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 30 Apr 2019 14:07:12 +0000
changeset 530765 a80227abf82bcd52d816a2d855be72d5a54028ee
parent 530764 51fa10aa3b4a99e220753f6c549d5e0ff732e52f
child 530766 f6a701d4a8986f310c5867540a5cf5b60ed5dcea
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbaku
bugs1547397
milestone68.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 1547397 - Part 1: Move some mochitests and browser-chrome tests for cookies out of extensions/cookies; r=baku Differential Revision: https://phabricator.services.mozilla.com/D29117
extensions/cookie/test/beltzner.jpg
extensions/cookie/test/beltzner.jpg^headers^
extensions/cookie/test/browser.ini
extensions/cookie/test/browser_test_favicon.js
extensions/cookie/test/damonbowling.jpg
extensions/cookie/test/damonbowling.jpg^headers^
extensions/cookie/test/file_chromecommon.js
extensions/cookie/test/file_domain_hierarchy_inner.html
extensions/cookie/test/file_domain_hierarchy_inner_inner.html
extensions/cookie/test/file_domain_hierarchy_inner_inner_inner.html
extensions/cookie/test/file_domain_inner.html
extensions/cookie/test/file_domain_inner_inner.html
extensions/cookie/test/file_favicon.html
extensions/cookie/test/file_image_inner.html
extensions/cookie/test/file_image_inner_inner.html
extensions/cookie/test/file_loadflags_inner.html
extensions/cookie/test/file_localhost_inner.html
extensions/cookie/test/file_loopback_inner.html
extensions/cookie/test/file_subdomain_inner.html
extensions/cookie/test/file_testcommon.js
extensions/cookie/test/file_testloadflags.js
extensions/cookie/test/file_testloadflags_chromescript.js
extensions/cookie/test/image1.png
extensions/cookie/test/image1.png^headers^
extensions/cookie/test/image2.png
extensions/cookie/test/image2.png^headers^
extensions/cookie/test/mochitest.ini
extensions/cookie/test/moz.build
extensions/cookie/test/test1.css
extensions/cookie/test/test1.css^headers^
extensions/cookie/test/test2.css
extensions/cookie/test/test2.css^headers^
extensions/cookie/test/test_different_domain_in_hierarchy.html
extensions/cookie/test/test_differentdomain.html
extensions/cookie/test/test_image.html
extensions/cookie/test/test_loadflags.html
extensions/cookie/test/test_same_base_domain.html
extensions/cookie/test/test_same_base_domain_2.html
extensions/cookie/test/test_same_base_domain_3.html
extensions/cookie/test/test_same_base_domain_4.html
extensions/cookie/test/test_same_base_domain_5.html
extensions/cookie/test/test_same_base_domain_6.html
extensions/cookie/test/test_samedomain.html
netwerk/test/browser/browser.ini
netwerk/test/browser/browser_test_favicon.js
netwerk/test/browser/damonbowling.jpg
netwerk/test/browser/damonbowling.jpg^headers^
netwerk/test/browser/file_favicon.html
netwerk/test/mochitests/beltzner.jpg
netwerk/test/mochitests/beltzner.jpg^headers^
netwerk/test/mochitests/file_chromecommon.js
netwerk/test/mochitests/file_domain_hierarchy_inner.html
netwerk/test/mochitests/file_domain_hierarchy_inner_inner.html
netwerk/test/mochitests/file_domain_hierarchy_inner_inner_inner.html
netwerk/test/mochitests/file_domain_inner.html
netwerk/test/mochitests/file_domain_inner_inner.html
netwerk/test/mochitests/file_image_inner.html
netwerk/test/mochitests/file_image_inner_inner.html
netwerk/test/mochitests/file_loadflags_inner.html
netwerk/test/mochitests/file_localhost_inner.html
netwerk/test/mochitests/file_loopback_inner.html
netwerk/test/mochitests/file_subdomain_inner.html
netwerk/test/mochitests/file_testcommon.js
netwerk/test/mochitests/file_testloadflags.js
netwerk/test/mochitests/file_testloadflags_chromescript.js
netwerk/test/mochitests/image1.png
netwerk/test/mochitests/image1.png^headers^
netwerk/test/mochitests/image2.png
netwerk/test/mochitests/image2.png^headers^
netwerk/test/mochitests/mochitest.ini
netwerk/test/mochitests/test1.css
netwerk/test/mochitests/test1.css^headers^
netwerk/test/mochitests/test2.css
netwerk/test/mochitests/test2.css^headers^
netwerk/test/mochitests/test_different_domain_in_hierarchy.html
netwerk/test/mochitests/test_differentdomain.html
netwerk/test/mochitests/test_image.html
netwerk/test/mochitests/test_loadflags.html
netwerk/test/mochitests/test_same_base_domain.html
netwerk/test/mochitests/test_same_base_domain_2.html
netwerk/test/mochitests/test_same_base_domain_3.html
netwerk/test/mochitests/test_same_base_domain_4.html
netwerk/test/mochitests/test_same_base_domain_5.html
netwerk/test/mochitests/test_same_base_domain_6.html
netwerk/test/mochitests/test_samedomain.html
--- a/extensions/cookie/test/browser.ini
+++ b/extensions/cookie/test/browser.ini
@@ -1,15 +1,9 @@
 [DEFAULT]
 
-[browser_test_favicon.js]
-skip-if = (verify && (os == 'linux' || os == 'mac'))
-support-files =
-  damonbowling.jpg
-  damonbowling.jpg^headers^
-  file_favicon.html
 [browser_permmgr_sync.js]
 # The browser_permmgr_sync test tests e10s specific behavior, and runs code
 # paths which would hit the debug only assertion in
 # nsPermissionManager::PermissionKey::CreateFromPrincipal. Because of this, it
 # is only run in e10s opt builds.
 skip-if = debug || !e10s
 [browser_permmgr_viewsrc.js]
deleted file mode 100644
--- a/extensions/cookie/test/file_favicon.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-  <head>
-    <link rel="shortcut icon" href="http://example.org/browser/extensions/cookie/test/damonbowling.jpg">
-  </head>
-</html>
deleted file mode 100644
index 272d67c0ce680c4793b7290fdcbf8fb0f15419fa..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/extensions/cookie/test/mochitest.ini
+++ /dev/null
@@ -1,39 +0,0 @@
-[DEFAULT]
-support-files =
-  beltzner.jpg
-  beltzner.jpg^headers^
-  file_chromecommon.js
-  file_domain_hierarchy_inner.html
-  file_domain_hierarchy_inner_inner.html
-  file_domain_hierarchy_inner_inner_inner.html
-  file_domain_inner.html
-  file_domain_inner_inner.html
-  file_image_inner.html
-  file_image_inner_inner.html
-  file_loadflags_inner.html
-  file_localhost_inner.html
-  file_loopback_inner.html
-  file_subdomain_inner.html
-  file_testcommon.js
-  file_testloadflags.js
-  file_testloadflags_chromescript.js
-  image1.png
-  image1.png^headers^
-  image2.png
-  image2.png^headers^
-  test1.css
-  test1.css^headers^
-  test2.css
-  test2.css^headers^
-
-[test_different_domain_in_hierarchy.html]
-[test_differentdomain.html]
-[test_image.html]
-[test_loadflags.html]
-[test_same_base_domain.html]
-[test_same_base_domain_2.html]
-[test_same_base_domain_3.html]
-[test_same_base_domain_4.html]
-[test_same_base_domain_5.html]
-[test_same_base_domain_6.html]
-[test_samedomain.html]
--- a/extensions/cookie/test/moz.build
+++ b/extensions/cookie/test/moz.build
@@ -7,12 +7,10 @@
 TEST_DIRS += [
     'gtest',
 ]
 
 XPCSHELL_TESTS_MANIFESTS += [
     'unit/xpcshell.ini',
 ]
 
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
 BROWSER_CHROME_MANIFESTS += ['browser.ini']
 
deleted file mode 100644
--- a/extensions/cookie/test/test2.css
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
--- a/netwerk/test/browser/browser.ini
+++ b/netwerk/test/browser/browser.ini
@@ -11,8 +11,14 @@ support-files =
 skip-if = !crashreporter || (e10s && debug && os == "linux" && bits == 64) || debug # Bug 1370783
 [browser_post_file.js]
 [browser_nsIFormPOSTActionChannel.js]
 skip-if = e10s # protocol handler and channel does not work in content process
 [browser_resource_navigation.js]
 [browser_test_io_activity.js]
 [browser_cookie_sync_across_tabs.js]
 [browser_cross_process_redirect.js]
+[browser_test_favicon.js]
+skip-if = (verify && (os == 'linux' || os == 'mac'))
+support-files =
+  damonbowling.jpg
+  damonbowling.jpg^headers^
+  file_favicon.html
rename from extensions/cookie/test/browser_test_favicon.js
rename to netwerk/test/browser/browser_test_favicon.js
--- a/extensions/cookie/test/browser_test_favicon.js
+++ b/netwerk/test/browser/browser_test_favicon.js
@@ -1,14 +1,14 @@
 // Tests third party cookie blocking using a favicon loaded from a different
 // domain. The cookie should be considered third party.
 
 add_task(async function() {
-  const iconUrl = "http://example.org/browser/extensions/cookie/test/damonbowling.jpg";
-  const pageUrl = "http://example.com/browser/extensions/cookie/test/file_favicon.html";
+  const iconUrl = "http://example.org/browser/netwerk/test/browser/damonbowling.jpg";
+  const pageUrl = "http://example.com/browser/netwerk/test/browser/file_favicon.html";
 	await SpecialPowers.pushPrefEnv({"set": [["network.cookie.cookieBehavior", 1]]});
 
   let promise = TestUtils.topicObserved("cookie-rejected", subject => {
     let uri = subject.QueryInterface(Ci.nsIURI);
     return uri.spec == iconUrl;
   });
 
   // Kick off a page load that will load the favicon.
rename from extensions/cookie/test/damonbowling.jpg
rename to netwerk/test/browser/damonbowling.jpg
rename from extensions/cookie/test/damonbowling.jpg^headers^
rename to netwerk/test/browser/damonbowling.jpg^headers^
new file mode 100644
--- /dev/null
+++ b/netwerk/test/browser/file_favicon.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+
+<html>
+  <head>
+    <link rel="shortcut icon" href="http://example.org/browser/netwerk/test/browser/damonbowling.jpg">
+  </head>
+</html>
rename from extensions/cookie/test/beltzner.jpg
rename to netwerk/test/mochitests/beltzner.jpg
rename from extensions/cookie/test/beltzner.jpg^headers^
rename to netwerk/test/mochitests/beltzner.jpg^headers^
rename from extensions/cookie/test/file_chromecommon.js
rename to netwerk/test/mochitests/file_chromecommon.js
rename from extensions/cookie/test/file_domain_hierarchy_inner.html
rename to netwerk/test/mochitests/file_domain_hierarchy_inner.html
--- a/extensions/cookie/test/file_domain_hierarchy_inner.html
+++ b/netwerk/test/mochitests/file_domain_hierarchy_inner.html
@@ -4,11 +4,11 @@
   <META HTTP-EQUIV="Set-Cookie" CONTENT="meta=tag">
   <script type="text/javascript">
     document.cookie = "can=has";
 
     // send a message to our test document, to say we're done loading
     window.opener.postMessage("message", "http://mochi.test:8888");
   </script>
 <body>
-<iframe name="frame1" src="http://example.com/tests/extensions/cookie/test/file_domain_hierarchy_inner_inner.html"></iframe>
+<iframe name="frame1" src="http://example.com/tests/netwerk/test/mochitests/file_domain_hierarchy_inner_inner.html"></iframe>
 </body>
 </html>
rename from extensions/cookie/test/file_domain_hierarchy_inner_inner.html
rename to netwerk/test/mochitests/file_domain_hierarchy_inner_inner.html
--- a/extensions/cookie/test/file_domain_hierarchy_inner_inner.html
+++ b/netwerk/test/mochitests/file_domain_hierarchy_inner_inner.html
@@ -4,11 +4,11 @@
   <META HTTP-EQUIV="Set-Cookie" CONTENT="meta2=tag2">
   <script type="text/javascript">
     document.cookie = "can2=has2";
 
     // send a message to our test document, to say we're done loading
     window.parent.opener.postMessage("message", "http://mochi.test:8888");
   </script>
 <body>
-<iframe name="frame1" src="http://example.org/tests/extensions/cookie/test/file_domain_hierarchy_inner_inner_inner.html"></iframe>
+<iframe name="frame1" src="http://example.org/tests/netwerk/test/mochitests/file_domain_hierarchy_inner_inner_inner.html"></iframe>
 </body>
 </html>
rename from extensions/cookie/test/file_domain_hierarchy_inner_inner_inner.html
rename to netwerk/test/mochitests/file_domain_hierarchy_inner_inner_inner.html
rename from extensions/cookie/test/file_domain_inner.html
rename to netwerk/test/mochitests/file_domain_inner.html
--- a/extensions/cookie/test/file_domain_inner.html
+++ b/netwerk/test/mochitests/file_domain_inner.html
@@ -4,11 +4,11 @@
   <META HTTP-EQUIV="Set-Cookie" CONTENT="meta=tag">
   <script type="text/javascript">
     document.cookie = "can=has";
 
     // send a message to our test document, to say we're done loading
     window.opener.postMessage("message", "http://mochi.test:8888");
   </script>
 <body>
-<iframe name="frame1" src="http://example.org/tests/extensions/cookie/test/file_domain_inner_inner.html"></iframe>
+<iframe name="frame1" src="http://example.org/tests/netwerk/test/mochitests/file_domain_inner_inner.html"></iframe>
 </body>
 </html>
rename from extensions/cookie/test/file_domain_inner_inner.html
rename to netwerk/test/mochitests/file_domain_inner_inner.html
rename from extensions/cookie/test/file_image_inner.html
rename to netwerk/test/mochitests/file_image_inner.html
--- a/extensions/cookie/test/file_image_inner.html
+++ b/netwerk/test/mochitests/file_image_inner.html
@@ -5,11 +5,11 @@
   <script type="text/javascript">
     document.cookie = "can=has";
 
     // send a message to our test document, to say we're done loading
     window.opener.postMessage("message", "http://mochi.test:8888");
   </script>
 </head>
 <body>
-<iframe name="frame1" src="http://example.org/tests/extensions/cookie/test/file_image_inner_inner.html"></iframe>
+<iframe name="frame1" src="http://example.org/tests/netwerk/test/mochitests/file_image_inner_inner.html"></iframe>
 </body>
 </html>
rename from extensions/cookie/test/file_image_inner_inner.html
rename to netwerk/test/mochitests/file_image_inner_inner.html
--- a/extensions/cookie/test/file_image_inner_inner.html
+++ b/netwerk/test/mochitests/file_image_inner_inner.html
@@ -1,20 +1,20 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <link rel="stylesheet" type="text/css" media="all" href="http://example.org/tests/extensions/cookie/test/test1.css" />
-  <link rel="stylesheet" type="text/css" media="all" href="http://example.com/tests/extensions/cookie/test/test2.css" />
+  <link rel="stylesheet" type="text/css" media="all" href="http://example.org/tests/netwerk/test/mochitests/test1.css" />
+  <link rel="stylesheet" type="text/css" media="all" href="http://example.com/tests/netwerk/test/mochitests/test2.css" />
   <META HTTP-EQUIV="Set-Cookie" CONTENT="meta2=tag2">
   <script type="text/javascript">
     function runTest() {
       document.cookie = "can2=has2";
 
       // send a message to our test document, to say we're done loading
       window.parent.opener.postMessage("message", "http://mochi.test:8888");
     }
   </script>
 </head>
 <body>
-<img src="http://example.org/tests/extensions/cookie/test/image1.png" onload="runTest()" />
-<img src="http://example.com/tests/extensions/cookie/test/image2.png" onload="runTest()" />
+<img src="http://example.org/tests/netwerk/test/mochitests/image1.png" onload="runTest()" />
+<img src="http://example.com/tests/netwerk/test/mochitests/image2.png" onload="runTest()" />
 </body>
 </html>
rename from extensions/cookie/test/file_loadflags_inner.html
rename to netwerk/test/mochitests/file_loadflags_inner.html
--- a/extensions/cookie/test/file_loadflags_inner.html
+++ b/netwerk/test/mochitests/file_loadflags_inner.html
@@ -7,11 +7,11 @@
       document.cookie = "can=has";
 
       // send a message to our test document, to say we're done loading
       window.opener.postMessage("f_lf_i msg data img", "http://mochi.test:8888");
     }
   </script>
 </head>
 <body onload="window.opener.postMessage('f_lf_i msg data page', 'http://mochi.test:8888');">
-<img src="http://example.org/tests/extensions/cookie/test/beltzner.jpg" onload="runTest()" />
+<img src="http://example.org/tests/netwerk/test/mochitests/beltzner.jpg" onload="runTest()" />
 </body>
 </html>
rename from extensions/cookie/test/file_localhost_inner.html
rename to netwerk/test/mochitests/file_localhost_inner.html
--- a/extensions/cookie/test/file_localhost_inner.html
+++ b/netwerk/test/mochitests/file_localhost_inner.html
@@ -4,11 +4,11 @@
   <META HTTP-EQUIV="Set-Cookie" CONTENT="meta=tag">
   <script type="text/javascript">
     document.cookie = "can=has";
 
     // send a message to our test document, to say we're done loading
     window.opener.postMessage("message", "http://mochi.test:8888");
   </script>
 <body>
-<iframe name="frame1" src="http://mochi.test:8888/tests/extensions/cookie/test/file_domain_inner_inner.html"></iframe>
+<iframe name="frame1" src="http://mochi.test:8888/tests/netwerk/test/mochitests/file_domain_inner_inner.html"></iframe>
 </body>
 </html>
rename from extensions/cookie/test/file_loopback_inner.html
rename to netwerk/test/mochitests/file_loopback_inner.html
--- a/extensions/cookie/test/file_loopback_inner.html
+++ b/netwerk/test/mochitests/file_loopback_inner.html
@@ -4,11 +4,11 @@
   <META HTTP-EQUIV="Set-Cookie" CONTENT="meta=tag">
   <script type="text/javascript">
     document.cookie = "can=has";
 
     // send a message to our test document, to say we're done loading
     window.opener.postMessage("message", "http://mochi.test:8888");
   </script>
 <body>
-<iframe name="frame1" src="http://127.0.0.1:8888/tests/extensions/cookie/test/file_domain_inner_inner.html"></iframe>
+<iframe name="frame1" src="http://127.0.0.1:8888/tests/netwerk/test/mochitests/file_domain_inner_inner.html"></iframe>
 </body>
 </html>
rename from extensions/cookie/test/file_subdomain_inner.html
rename to netwerk/test/mochitests/file_subdomain_inner.html
--- a/extensions/cookie/test/file_subdomain_inner.html
+++ b/netwerk/test/mochitests/file_subdomain_inner.html
@@ -4,11 +4,11 @@
   <META HTTP-EQUIV="Set-Cookie" CONTENT="meta=tag">
   <script type="text/javascript">
     document.cookie = "can=has";
 
     // send a message to our test document, to say we're done loading
     window.opener.postMessage("message", "http://mochi.test:8888");
   </script>
 <body>
-<iframe name="frame1" src="http://test2.example.org/tests/extensions/cookie/test/file_domain_inner_inner.html"></iframe>
+<iframe name="frame1" src="http://test2.example.org/tests/netwerk/test/mochitests/file_domain_inner_inner.html"></iframe>
 </body>
 </html>
rename from extensions/cookie/test/file_testcommon.js
rename to netwerk/test/mochitests/file_testcommon.js
rename from extensions/cookie/test/file_testloadflags.js
rename to netwerk/test/mochitests/file_testloadflags.js
rename from extensions/cookie/test/file_testloadflags_chromescript.js
rename to netwerk/test/mochitests/file_testloadflags_chromescript.js
--- a/extensions/cookie/test/file_testloadflags_chromescript.js
+++ b/netwerk/test/mochitests/file_testloadflags_chromescript.js
@@ -37,17 +37,17 @@ obs.prototype = {
           info(aHeader + ": " + aValue);
         }});
     } catch (err) {
       ok(false, "catch error " + err);
     }
 
     // Ignore notifications we don't care about (like favicons)
     if (!channel.URI.spec.includes(
-          "http://example.org/tests/extensions/cookie/test/")) {
+          "http://example.org/tests/netwerk/test/mochitests/")) {
       info("ignoring this one");
       return;
     }
 
     sendAsyncMessage("observer:gotCookie",
                      { cookie: channel.getRequestHeader("Cookie"),
                        uri: channel.URI.spec });
   },
rename from extensions/cookie/test/image1.png
rename to netwerk/test/mochitests/image1.png
rename from extensions/cookie/test/image1.png^headers^
rename to netwerk/test/mochitests/image1.png^headers^
copy from extensions/cookie/test/image1.png
copy to netwerk/test/mochitests/image2.png
rename from extensions/cookie/test/image2.png^headers^
rename to netwerk/test/mochitests/image2.png^headers^
--- a/netwerk/test/mochitests/mochitest.ini
+++ b/netwerk/test/mochitests/mochitest.ini
@@ -17,16 +17,41 @@ support-files =
   redirect_idn.html^headers^
   redirect_idn.html
   empty.html
   redirect.sjs
   origin_header.sjs
   origin_header_form_post.html
   origin_header_form_post_xorigin.html
   subResources.sjs
+  beltzner.jpg
+  beltzner.jpg^headers^
+  file_chromecommon.js
+  file_domain_hierarchy_inner.html
+  file_domain_hierarchy_inner_inner.html
+  file_domain_hierarchy_inner_inner_inner.html
+  file_domain_inner.html
+  file_domain_inner_inner.html
+  file_image_inner.html
+  file_image_inner_inner.html
+  file_loadflags_inner.html
+  file_localhost_inner.html
+  file_loopback_inner.html
+  file_subdomain_inner.html
+  file_testcommon.js
+  file_testloadflags.js
+  file_testloadflags_chromescript.js
+  image1.png
+  image1.png^headers^
+  image2.png
+  image2.png^headers^
+  test1.css
+  test1.css^headers^
+  test2.css
+  test2.css^headers^
 
 [test_arraybufferinputstream.html]
 [test_documentcookies_maxage.html]
 [test_idn_redirect.html]
 [test_loadinfo_redirectchain.html]
 [test_partially_cached_content.html]
 [test_rel_preconnect.html]
 [test_redirect_ref.html]
@@ -45,8 +70,19 @@ skip-if = verify
 [test_1421324.html]
 [test_1425031.html]
 [test_1503201.html]
 [test_origin_header.html]
 [test_1502055.html]
 support-files = sw_1502055.js file_1502055.sjs iframe_1502055.html
 [test_accept_header.html]
 support-files = test_accept_header.sjs
+[test_different_domain_in_hierarchy.html]
+[test_differentdomain.html]
+[test_image.html]
+[test_loadflags.html]
+[test_same_base_domain.html]
+[test_same_base_domain_2.html]
+[test_same_base_domain_3.html]
+[test_same_base_domain_4.html]
+[test_same_base_domain_5.html]
+[test_same_base_domain_6.html]
+[test_samedomain.html]
rename from extensions/cookie/test/test1.css
rename to netwerk/test/mochitests/test1.css
rename from extensions/cookie/test/test1.css^headers^
rename to netwerk/test/mochitests/test1.css^headers^
copy from extensions/cookie/test/test1.css
copy to netwerk/test/mochitests/test2.css
rename from extensions/cookie/test/test2.css^headers^
rename to netwerk/test/mochitests/test2.css^headers^
rename from extensions/cookie/test/test_different_domain_in_hierarchy.html
rename to netwerk/test/mochitests/test_different_domain_in_hierarchy.html
--- a/extensions/cookie/test/test_different_domain_in_hierarchy.html
+++ b/netwerk/test/mochitests/test_different_domain_in_hierarchy.html
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Test cookie requests from within a window hierarchy of different base domains</title>
   <script src="/tests/SimpleTest/SimpleTest.js"></script>        
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
-<body onload="setupTest('http://example.org/tests/extensions/cookie/test/file_domain_hierarchy_inner.html', 3, 3)">
+<body onload="setupTest('http://example.org/tests/netwerk/test/mochitests/file_domain_hierarchy_inner.html', 3, 3)">
 <p id="display"></p>
 <pre id="test">
 <script class="testbody" type="text/javascript" src="file_testcommon.js">
 </script>
 </pre>
 </body>
 </html>
rename from extensions/cookie/test/test_differentdomain.html
rename to netwerk/test/mochitests/test_differentdomain.html
--- a/extensions/cookie/test/test_differentdomain.html
+++ b/netwerk/test/mochitests/test_differentdomain.html
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Test for Cross domain access to properties</title>
   <script src="/tests/SimpleTest/SimpleTest.js"></script>        
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
-<body onload="setupTest('http://example.com/tests/extensions/cookie/test/file_domain_inner.html', 3, 2)">
+<body onload="setupTest('http://example.com/tests/netwerk/test/mochitests/file_domain_inner.html', 3, 2)">
 <p id="display"></p>
 <pre id="test">
 <script class="testbody" type="text/javascript" src="file_testcommon.js">
 </script>
 </pre>
 </body>
 </html>
rename from extensions/cookie/test/test_image.html
rename to netwerk/test/mochitests/test_image.html
--- a/extensions/cookie/test/test_image.html
+++ b/netwerk/test/mochitests/test_image.html
@@ -1,14 +1,14 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Test for Cross domain access to properties</title>
   <script src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
-<body onload="setupTest('http://example.org/tests/extensions/cookie/test/file_image_inner.html', 7, 3)">
+<body onload="setupTest('http://example.org/tests/netwerk/test/mochitests/file_image_inner.html', 7, 3)">
 <p id="display"></p>
 <pre id="test">
 <script class="testbody" type="text/javascript" src="file_testcommon.js"></script>
 </pre>
 </body>
 </html>
rename from extensions/cookie/test/test_loadflags.html
rename to netwerk/test/mochitests/test_loadflags.html
--- a/extensions/cookie/test/test_loadflags.html
+++ b/netwerk/test/mochitests/test_loadflags.html
@@ -6,16 +6,16 @@
   <script src="/tests/SimpleTest/SimpleTest.js"></script>        
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <!--
  *5 cookies: 1+1 from file_testloadflags.js, 2 from file_loadflags_inner.html + 1 from beltzner.jpg.
  *1 load: file_loadflags_inner.html.
  *2 headers: 1 for file_loadflags_inner.html + 1 for beltzner.jpg.
  -->
-<body onload="setupTest('http://example.org/tests/extensions/cookie/test/file_loadflags_inner.html', 'example.org', 5, 2, 2)">
+<body onload="setupTest('http://example.org/tests/netwerk/test/mochitests/file_loadflags_inner.html', 'example.org', 5, 2, 2)">
 <p id="display"></p>
 <pre id="test">
 <script class="testbody" type="text/javascript" src="file_testloadflags.js">
 </script>
 </pre>
 </body>
 </html>
rename from extensions/cookie/test/test_same_base_domain.html
rename to netwerk/test/mochitests/test_same_base_domain.html
--- a/extensions/cookie/test/test_same_base_domain.html
+++ b/netwerk/test/mochitests/test_same_base_domain.html
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Test for Cross domain access to properties</title>
   <script src="/tests/SimpleTest/SimpleTest.js"></script>        
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
-<body onload="setupTest('http://test1.example.org/tests/extensions/cookie/test/file_domain_inner.html', 5, 2)">
+<body onload="setupTest('http://test1.example.org/tests/netwerk/test/mochitests/file_domain_inner.html', 5, 2)">
 <p id="display"></p>
 <pre id="test">
 <script class="testbody" type="text/javascript" src="file_testcommon.js">
 </script>
 </pre>
 </body>
 </html>
rename from extensions/cookie/test/test_same_base_domain_2.html
rename to netwerk/test/mochitests/test_same_base_domain_2.html
--- a/extensions/cookie/test/test_same_base_domain_2.html
+++ b/netwerk/test/mochitests/test_same_base_domain_2.html
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Test for Cross domain access to properties</title>
   <script src="/tests/SimpleTest/SimpleTest.js"></script>        
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
-<body onload="setupTest('http://test1.example.org/tests/extensions/cookie/test/file_subdomain_inner.html', 5, 2)">
+<body onload="setupTest('http://test1.example.org/tests/netwerk/test/mochitests/file_subdomain_inner.html', 5, 2)">
 <p id="display"></p>
 <pre id="test">
 <script class="testbody" type="text/javascript" src="file_testcommon.js">
 </script>
 </pre>
 </body>
 </html>
rename from extensions/cookie/test/test_same_base_domain_3.html
rename to netwerk/test/mochitests/test_same_base_domain_3.html
--- a/extensions/cookie/test/test_same_base_domain_3.html
+++ b/netwerk/test/mochitests/test_same_base_domain_3.html
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Test for Cross domain access to properties</title>
   <script src="/tests/SimpleTest/SimpleTest.js"></script>        
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
-<body onload="setupTest('http://example.org/tests/extensions/cookie/test/file_subdomain_inner.html', 5, 2)">
+<body onload="setupTest('http://example.org/tests/netwerk/test/mochitests/file_subdomain_inner.html', 5, 2)">
 <p id="display"></p>
 <pre id="test">
 <script class="testbody" type="text/javascript" src="file_testcommon.js">
 </script>
 </pre>
 </body>
 </html>
rename from extensions/cookie/test/test_same_base_domain_4.html
rename to netwerk/test/mochitests/test_same_base_domain_4.html
--- a/extensions/cookie/test/test_same_base_domain_4.html
+++ b/netwerk/test/mochitests/test_same_base_domain_4.html
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Test for Cross domain access to properties</title>
   <script src="/tests/SimpleTest/SimpleTest.js"></script>        
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
-<body onload="setupTest('http://mochi.test:8888/tests/extensions/cookie/test/file_localhost_inner.html', 5, 2)">
+<body onload="setupTest('http://mochi.test:8888/tests/netwerk/test/mochitests/file_localhost_inner.html', 5, 2)">
 <p id="display"></p>
 <pre id="test">
 <script class="testbody" type="text/javascript" src="file_testcommon.js">
 </script>
 </pre>
 </body>
 </html>
rename from extensions/cookie/test/test_same_base_domain_5.html
rename to netwerk/test/mochitests/test_same_base_domain_5.html
--- a/extensions/cookie/test/test_same_base_domain_5.html
+++ b/netwerk/test/mochitests/test_same_base_domain_5.html
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Test for Cross domain access to properties</title>
   <script src="/tests/SimpleTest/SimpleTest.js"></script>        
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
-<body onload="setupTest('http://sub1.test1.example.org/tests/extensions/cookie/test/file_subdomain_inner.html', 5, 2)">
+<body onload="setupTest('http://sub1.test1.example.org/tests/netwerk/test/mochitests/file_subdomain_inner.html', 5, 2)">
 <p id="display"></p>
 <pre id="test">
 <script class="testbody" type="text/javascript" src="file_testcommon.js">
 </script>
 </pre>
 </body>
 </html>
rename from extensions/cookie/test/test_same_base_domain_6.html
rename to netwerk/test/mochitests/test_same_base_domain_6.html
--- a/extensions/cookie/test/test_same_base_domain_6.html
+++ b/netwerk/test/mochitests/test_same_base_domain_6.html
@@ -10,17 +10,17 @@
 <pre id="test">
   <script>
     function runThisTest() {
       // By default, proxies don't apply to 127.0.0.1.
       // We need them to for this test (at least on android), though:
       SpecialPowers.pushPrefEnv({set: [
         ["network.proxy.allow_hijacking_localhost", true]
       ]}).then(function() {
-        setupTest('http://127.0.0.1:8888/tests/extensions/cookie/test/file_loopback_inner.html', 5, 2);
+        setupTest('http://127.0.0.1:8888/tests/netwerk/test/mochitests/file_loopback_inner.html', 5, 2);
       });
     }
   </script>
 <script class="testbody" type="text/javascript" src="file_testcommon.js">
 </script>
 </pre>
 </body>
 </html>
rename from extensions/cookie/test/test_samedomain.html
rename to netwerk/test/mochitests/test_samedomain.html
--- a/extensions/cookie/test/test_samedomain.html
+++ b/netwerk/test/mochitests/test_samedomain.html
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Test for Cross domain access to properties</title>
   <script src="/tests/SimpleTest/SimpleTest.js"></script>        
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
-<body onload="setupTest('http://example.org/tests/extensions/cookie/test/file_domain_inner.html', 5, 2)">
+<body onload="setupTest('http://example.org/tests/netwerk/test/mochitests/file_domain_inner.html', 5, 2)">
 <p id="display"></p>
 <pre id="test">
 <script class="testbody" type="text/javascript" src="file_testcommon.js">
 </script>
 </pre>
 </body>
 </html>