From 09b59197651769f8ee08cea0ff30c03e6548b65c Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Tue, 31 Dec 2013 10:06:10 +0100
Subject: [PATCH] Bug 939048 - Part d: Move mochitests to manifests in
 dom/tests/mochitest/webapps/apps; r=jst

---
 dom/tests/mochitest/moz.build                |  3 +-
 dom/tests/mochitest/webapps/apps/Makefile.in | 37 --------------------
 dom/tests/mochitest/webapps/apps/moz.build   |  6 ----
 dom/tests/mochitest/webapps/chrome.ini       |  1 +
 dom/tests/mochitest/webapps/moz.build        | 12 -------
 5 files changed, 3 insertions(+), 56 deletions(-)
 delete mode 100644 dom/tests/mochitest/webapps/apps/Makefile.in
 delete mode 100644 dom/tests/mochitest/webapps/apps/moz.build
 delete mode 100644 dom/tests/mochitest/webapps/moz.build

diff --git a/dom/tests/mochitest/moz.build b/dom/tests/mochitest/moz.build
index 0cb3ea858f639..cb06109505a27 100644
--- a/dom/tests/mochitest/moz.build
+++ b/dom/tests/mochitest/moz.build
@@ -17,7 +17,6 @@ DIRS += [
     'sessionstorage',
     'storageevent',
     'notification',
-    'webapps',
     'webcomponents',
 ]
 
@@ -28,10 +27,12 @@ MOCHITEST_MANIFESTS += [
     'dom-level1-core/mochitest.ini',
     'dom-level2-core/mochitest.ini',
     'dom-level2-html/mochitest.ini',
+    'webapps/mochitest.ini',
     'whatwg/mochitest.ini',
 ]
 
 MOCHITEST_CHROME_MANIFESTS += [
+    'webapps/chrome.ini',
     'whatwg/chrome.ini',
 ]
 
diff --git a/dom/tests/mochitest/webapps/apps/Makefile.in b/dom/tests/mochitest/webapps/apps/Makefile.in
deleted file mode 100644
index 717f28281e308..0000000000000
--- a/dom/tests/mochitest/webapps/apps/Makefile.in
+++ /dev/null
@@ -1,37 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-MOCHITEST_CHROME_FILES	= \
-    basic.webapp \
-    basic.webapp^headers^ \
-    missing_required_field.webapp \
-    missing_required_field.webapp^headers^ \
-    json_syntax_error.webapp \
-    json_syntax_error.webapp^headers^ \
-    no_delegated_install.webapp \
-    no_delegated_install.webapp^headers^ \
-    bad_content_type.webapp \
-    utf8.webapp \
-    utf8.webapp^headers^ \
-    installs_allowed_from_chrome_mochitests.webapp \
-    installs_allowed_from_chrome_mochitests.webapp^headers^ \
-    installs_allowed_from_example.com.webapp \
-    installs_allowed_from_example.com.webapp^headers^ \
-    invalid_launch_path.webapp \
-    invalid_launch_path.webapp^headers^ \
-    invalid_launch_path2.webapp \
-    invalid_launch_path2.webapp^headers^ \
-    invalid_entry_point.webapp \
-    invalid_entry_point.webapp^headers^ \
-    invalid_locale_entry_point.webapp \
-    invalid_locale_entry_point.webapp^headers^ \
-    invalid_activity_href.webapp \
-    invalid_activity_href.webapp^headers^ \
-    invalid_activity_href2.webapp \
-    invalid_activity_href2.webapp^headers^ \
-    invalid_message.webapp \
-    invalid_message.webapp^headers^ \
-    launch_paths.webapp \
-    launch_paths.webapp^headers^ \
-    $(NULL)
diff --git a/dom/tests/mochitest/webapps/apps/moz.build b/dom/tests/mochitest/webapps/apps/moz.build
deleted file mode 100644
index 895d11993cfbb..0000000000000
--- a/dom/tests/mochitest/webapps/apps/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
diff --git a/dom/tests/mochitest/webapps/chrome.ini b/dom/tests/mochitest/webapps/chrome.ini
index 279f6daf65ea5..011f2a9bc31f9 100644
--- a/dom/tests/mochitest/webapps/chrome.ini
+++ b/dom/tests/mochitest/webapps/chrome.ini
@@ -3,6 +3,7 @@ support-files =
   cross_origin.html
   head.js
   install_and_redirect_helper.xul
+  apps/*
 
 [test_bug_765063.xul]
 [test_bug_771294.xul]
diff --git a/dom/tests/mochitest/webapps/moz.build b/dom/tests/mochitest/webapps/moz.build
deleted file mode 100644
index a32c660974764..0000000000000
--- a/dom/tests/mochitest/webapps/moz.build
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-DIRS += ['apps']
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-