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

--HG--
rename : extensions/cookie/test/browser_test_favicon.js => netwerk/test/browser/browser_test_favicon.js
rename : extensions/cookie/test/damonbowling.jpg => netwerk/test/browser/damonbowling.jpg
rename : extensions/cookie/test/damonbowling.jpg^headers^ => netwerk/test/browser/damonbowling.jpg^headers^
rename : extensions/cookie/test/beltzner.jpg => netwerk/test/mochitests/beltzner.jpg
rename : extensions/cookie/test/beltzner.jpg^headers^ => netwerk/test/mochitests/beltzner.jpg^headers^
rename : extensions/cookie/test/file_chromecommon.js => netwerk/test/mochitests/file_chromecommon.js
rename : extensions/cookie/test/file_domain_hierarchy_inner.html => netwerk/test/mochitests/file_domain_hierarchy_inner.html
rename : extensions/cookie/test/file_domain_hierarchy_inner_inner.html => netwerk/test/mochitests/file_domain_hierarchy_inner_inner.html
rename : extensions/cookie/test/file_domain_hierarchy_inner_inner_inner.html => netwerk/test/mochitests/file_domain_hierarchy_inner_inner_inner.html
rename : extensions/cookie/test/file_domain_inner.html => netwerk/test/mochitests/file_domain_inner.html
rename : extensions/cookie/test/file_domain_inner_inner.html => netwerk/test/mochitests/file_domain_inner_inner.html
rename : extensions/cookie/test/file_image_inner.html => netwerk/test/mochitests/file_image_inner.html
rename : extensions/cookie/test/file_image_inner_inner.html => netwerk/test/mochitests/file_image_inner_inner.html
rename : extensions/cookie/test/file_loadflags_inner.html => netwerk/test/mochitests/file_loadflags_inner.html
rename : extensions/cookie/test/file_localhost_inner.html => netwerk/test/mochitests/file_localhost_inner.html
rename : extensions/cookie/test/file_loopback_inner.html => netwerk/test/mochitests/file_loopback_inner.html
rename : extensions/cookie/test/file_subdomain_inner.html => netwerk/test/mochitests/file_subdomain_inner.html
rename : extensions/cookie/test/file_testcommon.js => netwerk/test/mochitests/file_testcommon.js
rename : extensions/cookie/test/file_testloadflags.js => netwerk/test/mochitests/file_testloadflags.js
rename : extensions/cookie/test/file_testloadflags_chromescript.js => netwerk/test/mochitests/file_testloadflags_chromescript.js
rename : extensions/cookie/test/image1.png => netwerk/test/mochitests/image1.png
rename : extensions/cookie/test/image1.png^headers^ => netwerk/test/mochitests/image1.png^headers^
rename : extensions/cookie/test/image1.png => netwerk/test/mochitests/image2.png
rename : extensions/cookie/test/image2.png^headers^ => netwerk/test/mochitests/image2.png^headers^
rename : extensions/cookie/test/test1.css => netwerk/test/mochitests/test1.css
rename : extensions/cookie/test/test1.css^headers^ => netwerk/test/mochitests/test1.css^headers^
rename : extensions/cookie/test/test1.css => netwerk/test/mochitests/test2.css
rename : extensions/cookie/test/test2.css^headers^ => netwerk/test/mochitests/test2.css^headers^
rename : extensions/cookie/test/test_different_domain_in_hierarchy.html => netwerk/test/mochitests/test_different_domain_in_hierarchy.html
rename : extensions/cookie/test/test_differentdomain.html => netwerk/test/mochitests/test_differentdomain.html
rename : extensions/cookie/test/test_image.html => netwerk/test/mochitests/test_image.html
rename : extensions/cookie/test/test_loadflags.html => netwerk/test/mochitests/test_loadflags.html
rename : extensions/cookie/test/test_same_base_domain.html => netwerk/test/mochitests/test_same_base_domain.html
rename : extensions/cookie/test/test_same_base_domain_2.html => netwerk/test/mochitests/test_same_base_domain_2.html
rename : extensions/cookie/test/test_same_base_domain_3.html => netwerk/test/mochitests/test_same_base_domain_3.html
rename : extensions/cookie/test/test_same_base_domain_4.html => netwerk/test/mochitests/test_same_base_domain_4.html
rename : extensions/cookie/test/test_same_base_domain_5.html => netwerk/test/mochitests/test_same_base_domain_5.html
rename : extensions/cookie/test/test_same_base_domain_6.html => netwerk/test/mochitests/test_same_base_domain_6.html
rename : extensions/cookie/test/test_samedomain.html => netwerk/test/mochitests/test_samedomain.html
extra : moz-landing-system : lando

extensions/cookie/test/browser.ini

@@ -1,11 +1,5 @@
 [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

extensions/cookie/test/file_favicon.html

@@ -1,7 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-  <head>
-    <link rel="shortcut icon" href="http://example.org/browser/extensions/cookie/test/damonbowling.jpg">
-  </head>
-</html>

extensions/cookie/test/mochitest.ini

@@ -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]

extensions/cookie/test/moz.build

@@ -12,7 +12,5 @@ XPCSHELL_TESTS_MANIFESTS += [
     'unit/xpcshell.ini',
 ]
 
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
 BROWSER_CHROME_MANIFESTS += ['browser.ini']
 

netwerk/test/browser/browser.ini

@@ -16,3 +16,9 @@ skip-if = e10s # protocol handler and channel does not work in content process
 [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

netwerk/test/browser/browser_test_favicon.js

@@ -2,8 +2,8 @@
 // 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 => {

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>

netwerk/test/mochitests/file_domain_hierarchy_inner.html

@@ -9,6 +9,6 @@
     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>

netwerk/test/mochitests/file_domain_hierarchy_inner_inner.html

@@ -9,6 +9,6 @@
     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>

netwerk/test/mochitests/file_domain_inner.html

@@ -9,6 +9,6 @@
     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>

netwerk/test/mochitests/file_image_inner.html

@@ -10,6 +10,6 @@
   </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>

netwerk/test/mochitests/file_image_inner_inner.html

@@ -1,8 +1,8 @@
 <!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() {
@@ -14,7 +14,7 @@
   </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>

netwerk/test/mochitests/file_loadflags_inner.html

@@ -12,6 +12,6 @@
   </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>

netwerk/test/mochitests/file_localhost_inner.html

@@ -9,6 +9,6 @@
     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>

netwerk/test/mochitests/file_loopback_inner.html

@@ -9,6 +9,6 @@
     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>

netwerk/test/mochitests/file_subdomain_inner.html

@@ -9,6 +9,6 @@
     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>

netwerk/test/mochitests/file_testloadflags_chromescript.js

@@ -42,7 +42,7 @@ obs.prototype = {
 
     // 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;
     }

netwerk/test/mochitests/mochitest.ini

@@ -22,6 +22,31 @@ support-files =
   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]
@@ -50,3 +75,14 @@ skip-if = verify
 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]

netwerk/test/mochitests/test_different_domain_in_hierarchy.html

@@ -5,7 +5,7 @@
   <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">

netwerk/test/mochitests/test_differentdomain.html

@@ -5,7 +5,7 @@
   <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">

netwerk/test/mochitests/test_image.html

@@ -5,7 +5,7 @@
   <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>

netwerk/test/mochitests/test_loadflags.html

@@ -11,7 +11,7 @@
  *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">

netwerk/test/mochitests/test_same_base_domain.html

@@ -5,7 +5,7 @@
   <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">

netwerk/test/mochitests/test_same_base_domain_2.html

@@ -5,7 +5,7 @@
   <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">

netwerk/test/mochitests/test_same_base_domain_3.html

@@ -5,7 +5,7 @@
   <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">

netwerk/test/mochitests/test_same_base_domain_4.html

@@ -5,7 +5,7 @@
   <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">

netwerk/test/mochitests/test_same_base_domain_5.html

@@ -5,7 +5,7 @@
   <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">

netwerk/test/mochitests/test_same_base_domain_6.html

@@ -15,7 +15,7 @@
       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>

netwerk/test/mochitests/test_samedomain.html

@@ -5,7 +5,7 @@
   <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">