Bug 1343521 - Move the mochitests in browser/modules/test/ to their own subdirectory. r=jaws

MozReview-Commit-ID: AV3QzLofo2w

--HG--
rename : browser/modules/test/.eslintrc.js => browser/modules/test/browser/.eslintrc.js
rename : browser/modules/test/browser.ini => browser/modules/test/browser/browser.ini
rename : browser/modules/test/browser_BrowserUITelemetry_buckets.js => browser/modules/test/browser/browser_BrowserUITelemetry_buckets.js
rename : browser/modules/test/browser_BrowserUITelemetry_defaults.js => browser/modules/test/browser/browser_BrowserUITelemetry_defaults.js
rename : browser/modules/test/browser_BrowserUITelemetry_sidebar.js => browser/modules/test/browser/browser_BrowserUITelemetry_sidebar.js
rename : browser/modules/test/browser_BrowserUITelemetry_syncedtabs.js => browser/modules/test/browser/browser_BrowserUITelemetry_syncedtabs.js
rename : browser/modules/test/browser_ContentSearch.js => browser/modules/test/browser/browser_ContentSearch.js
rename : browser/modules/test/browser_NetworkPrioritizer.js => browser/modules/test/browser/browser_NetworkPrioritizer.js
rename : browser/modules/test/browser_PermissionUI.js => browser/modules/test/browser/browser_PermissionUI.js
rename : browser/modules/test/browser_PermissionUI_prompts.js => browser/modules/test/browser/browser_PermissionUI_prompts.js
rename : browser/modules/test/browser_ProcessHangNotifications.js => browser/modules/test/browser/browser_ProcessHangNotifications.js
rename : browser/modules/test/browser_SelfSupportBackend.js => browser/modules/test/browser/browser_SelfSupportBackend.js
rename : browser/modules/test/browser_SitePermissions.js => browser/modules/test/browser/browser_SitePermissions.js
rename : browser/modules/test/browser_SitePermissions_combinations.js => browser/modules/test/browser/browser_SitePermissions_combinations.js
rename : browser/modules/test/browser_SitePermissions_expiry.js => browser/modules/test/browser/browser_SitePermissions_expiry.js
rename : browser/modules/test/browser_SitePermissions_tab_urls.js => browser/modules/test/browser/browser_SitePermissions_tab_urls.js
rename : browser/modules/test/browser_UnsubmittedCrashHandler.js => browser/modules/test/browser/browser_UnsubmittedCrashHandler.js
rename : browser/modules/test/browser_UsageTelemetry.js => browser/modules/test/browser/browser_UsageTelemetry.js
rename : browser/modules/test/browser_UsageTelemetry_content.js => browser/modules/test/browser/browser_UsageTelemetry_content.js
rename : browser/modules/test/browser_UsageTelemetry_content_aboutHome.js => browser/modules/test/browser/browser_UsageTelemetry_content_aboutHome.js
rename : browser/modules/test/browser_UsageTelemetry_private_and_restore.js => browser/modules/test/browser/browser_UsageTelemetry_private_and_restore.js
rename : browser/modules/test/browser_UsageTelemetry_searchbar.js => browser/modules/test/browser/browser_UsageTelemetry_searchbar.js
rename : browser/modules/test/browser_UsageTelemetry_urlbar.js => browser/modules/test/browser/browser_UsageTelemetry_urlbar.js
rename : browser/modules/test/browser_bug1319078.js => browser/modules/test/browser/browser_bug1319078.js
rename : browser/modules/test/browser_taskbar_preview.js => browser/modules/test/browser/browser_taskbar_preview.js
rename : browser/modules/test/browser_urlBar_zoom.js => browser/modules/test/browser/browser_urlBar_zoom.js
rename : browser/modules/test/contentSearch.js => browser/modules/test/browser/contentSearch.js
rename : browser/modules/test/contentSearchBadImage.xml => browser/modules/test/browser/contentSearchBadImage.xml
rename : browser/modules/test/contentSearchSuggestions.sjs => browser/modules/test/browser/contentSearchSuggestions.sjs
rename : browser/modules/test/contentSearchSuggestions.xml => browser/modules/test/browser/contentSearchSuggestions.xml
rename : browser/modules/test/head.js => browser/modules/test/browser/head.js
rename : browser/modules/test/usageTelemetrySearchSuggestions.sjs => browser/modules/test/browser/usageTelemetrySearchSuggestions.sjs
rename : browser/modules/test/usageTelemetrySearchSuggestions.xml => browser/modules/test/browser/usageTelemetrySearchSuggestions.xml
rename : browser/modules/test/xpcshell/.eslintrc.js => browser/modules/test/unit/.eslintrc.js
rename : browser/modules/test/xpcshell/test_AttributionCode.js => browser/modules/test/unit/test_AttributionCode.js
rename : browser/modules/test/xpcshell/test_DirectoryLinksProvider.js => browser/modules/test/unit/test_DirectoryLinksProvider.js
rename : browser/modules/test/xpcshell/test_E10SUtils_nested_URIs.js => browser/modules/test/unit/test_E10SUtils_nested_URIs.js
rename : browser/modules/test/xpcshell/test_LaterRun.js => browser/modules/test/unit/test_LaterRun.js
rename : browser/modules/test/xpcshell/test_SitePermissions.js => browser/modules/test/unit/test_SitePermissions.js
rename : browser/modules/test/xpcshell/xpcshell.ini => browser/modules/test/unit/xpcshell.ini
extra : rebase_source : e71a6ce0da1e6f286efce2b36cecc6081e004bf1

browser/modules/moz.build

@@ -4,10 +4,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
+BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
 XPCSHELL_TESTS_MANIFESTS += [
     'test/unit/social/xpcshell.ini',
-    'test/xpcshell/xpcshell.ini',
+    'test/unit/xpcshell.ini',
 ]
 
 EXTRA_JS_MODULES += [

browser/modules/test/browser/.eslintrc.js

@@ -2,6 +2,6 @@
 
 module.exports = {
   "extends": [
-    "../../../testing/mochitest/browser.eslintrc.js"
+    "../../../../testing/mochitest/browser.eslintrc.js"
   ]
 };

browser/modules/test/browser/browser.ini

@@ -21,8 +21,8 @@ support-files =
 skip-if = !e10s
 [browser_SelfSupportBackend.js]
 support-files =
-  ../../components/uitour/test/uitour.html
-  ../../components/uitour/UITour-lib.js
+  ../../../components/uitour/test/uitour.html
+  ../../../components/uitour/UITour-lib.js
 [browser_SitePermissions.js]
 [browser_SitePermissions_combinations.js]
 [browser_SitePermissions_expiry.js]

browser/modules/test/browser/browser_ContentSearch.js

@@ -8,7 +8,7 @@ const TEST_CONTENT_SCRIPT_BASENAME = "contentSearch.js";
 
 var gMsgMan;
 /* eslint no-undef:"error" */
-/* import-globals-from ../../components/search/test/head.js */
+/* import-globals-from ../../../components/search/test/head.js */
 Services.scriptloader.loadSubScript(
   "chrome://mochitests/content/browser/browser/components/search/test/head.js",
   this);

browser/modules/test/browser/contentSearchSuggestions.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>browser_ContentSearch contentSearchSuggestions.xml</ShortName>
-<Url type="application/x-suggestions+json" method="GET" template="http://mochi.test:8888/browser/browser/modules/test/contentSearchSuggestions.sjs?{searchTerms}"/>
+<Url type="application/x-suggestions+json" method="GET" template="http://mochi.test:8888/browser/browser/modules/test/browser/contentSearchSuggestions.sjs?{searchTerms}"/>
 <Url type="text/html" method="GET" template="http://browser-ContentSearch.com/contentSearchSuggestions" rel="searchform"/>
 </SearchPlugin>

browser/modules/test/browser/usageTelemetrySearchSuggestions.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>browser_UsageTelemetry usageTelemetrySearchSuggestions.xml</ShortName>
-<Url type="application/x-suggestions+json" method="GET" template="http://mochi.test:8888/browser/browser/modules/test/usageTelemetrySearchSuggestions.sjs?{searchTerms}"/>
+<Url type="application/x-suggestions+json" method="GET" template="http://mochi.test:8888/browser/browser/modules/test/browser/usageTelemetrySearchSuggestions.sjs?{searchTerms}"/>
 <Url type="text/html" method="GET" template="http://example.com" rel="searchform"/>
 </SearchPlugin>

browser/modules/test/unit/social/.eslintrc.js

@@ -1,7 +0,0 @@
-"use strict";
-
-module.exports = {
-  "extends": [
-    "../../../../../testing/xpcshell/xpcshell.eslintrc.js"
-  ]
-};

browser/modules/test/unit/social/head.js

@@ -35,7 +35,6 @@ function createAppInfo(ID, name, version, platformVersion = "1.0") {
     ID, name, version, platformVersion,
     crashReporter: true,
   });
-  gAppInfo = tmp.getAppInfo();
 }
 
 function initApp() {