Merge m-c to a CLOSED TREE m-i
authorPhil Ringnalda <philringnalda@gmail.com>
Fri, 18 Oct 2013 21:26:07 -0700
changeset 166159 c4f64a12e6ef7bb6ae8fed23290a700081c7aebc
parent 166158 f5052f28644e3661a3b9812b7ece73fb4e1eeed9 (current diff)
parent 166126 e25e62d174ed3b232c1ffe3b51580334a23dc577 (diff)
child 166160 3af0c2e6012cadb1cf0eb7e15b00d50f64665c22
child 166193 dc2b71e57211b1a71f17937aa3da729d5ecf4426
push id428
push userbbajaj@mozilla.com
push dateTue, 28 Jan 2014 00:16:25 +0000
treeherdermozilla-release@cd72a7ff3a75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone27.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
Merge m-c to a CLOSED TREE m-i
browser/components/places/tests/browser/browser.ini
browser/components/sessionstore/test/browser.ini
--- a/browser/components/certerror/moz.build
+++ b/browser/components/certerror/moz.build
@@ -1,9 +1,7 @@
 # -*- 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/.
 
-BROWSER_CHROME_MANIFESTS += [
-    'test/browser.ini',
-]
+TEST_DIRS += ['test']
new file mode 100644
--- /dev/null
+++ b/browser/components/certerror/test/moz.build
@@ -0,0 +1,8 @@
+# -*- 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/.
+
+BROWSER_CHROME_MANIFESTS += ['browser.ini']
+
--- a/browser/components/dirprovider/moz.build
+++ b/browser/components/dirprovider/moz.build
@@ -1,21 +1,20 @@
 # -*- 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/.
 
+TEST_DIRS += ['tests']
+
 MODULE = 'browserdir'
 
 EXPORTS.mozilla.browser += [
     'DirectoryProvider.h',
 ]
 
 CPP_SOURCES += [
     'DirectoryProvider.cpp',
 ]
 
 LIBRARY_NAME = 'browserdir_s'
 
-XPCSHELL_TESTS_MANIFESTS += [
-    'tests/unit/xpcshell.ini',
-]
new file mode 100644
--- /dev/null
+++ b/browser/components/dirprovider/tests/moz.build
@@ -0,0 +1,9 @@
+# -*- 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/.
+
+MODULE = 'test_browserdir'
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
--- a/browser/components/downloads/moz.build
+++ b/browser/components/downloads/moz.build
@@ -1,15 +1,8 @@
 # -*- 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 += ['src']
-
-XPCSHELL_TESTS_MANIFESTS += [
-    'test/unit/xpcshell.ini',
-]
-
-BROWSER_CHROME_MANIFESTS += [
-    'test/browser/browser.ini',
-]
+TEST_DIRS += ['test']
new file mode 100644
--- /dev/null
+++ b/browser/components/downloads/test/browser/moz.build
@@ -0,0 +1,8 @@
+# -*- 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/.
+
+BROWSER_CHROME_MANIFESTS += ['browser.ini']
+
new file mode 100644
--- /dev/null
+++ b/browser/components/downloads/test/moz.build
@@ -0,0 +1,9 @@
+# -*- 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 += ['browser']
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
--- a/browser/components/feeds/moz.build
+++ b/browser/components/feeds/moz.build
@@ -1,19 +1,8 @@
 # -*- 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 += ['public', 'src']
-
-XPCSHELL_TESTS_MANIFESTS += [
-    'test/unit/xpcshell.ini',
-]
-
-MOCHITEST_CHROME_MANIFESTS += [
-    'test/chrome/chrome.ini',
-]
-
-MOCHITEST_MANIFESTS += [
-    'test/mochitest.ini'
-]
+TEST_DIRS += ['test']
new file mode 100644
--- /dev/null
+++ b/browser/components/feeds/test/chrome/Makefile.in
@@ -0,0 +1,10 @@
+#
+# 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/.
+
+# sample_feed.atom was copied from toolkit/components/places/tests/chrome
+MOCHITEST_FILES	= \
+		sample_feed.atom \
+		$(NULL)
+
--- a/browser/components/feeds/test/chrome/chrome.ini
+++ b/browser/components/feeds/test/chrome/chrome.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
-support-files = sample_feed.atom
 
 [test_423060.xul]
 [test_bug368464.html]
 [test_bug408328.html]
 [test_maxSniffing.html]
new file mode 100644
--- /dev/null
+++ b/browser/components/feeds/test/chrome/moz.build
@@ -0,0 +1,8 @@
+# -*- 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/.
+
+MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
+
new file mode 100644
--- /dev/null
+++ b/browser/components/feeds/test/moz.build
@@ -0,0 +1,14 @@
+# -*- 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 += ['chrome']
+
+MODULE = 'test_browser_feeds'
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
+MOCHITEST_MANIFESTS += ['mochitest.ini']
+
--- a/browser/components/migration/moz.build
+++ b/browser/components/migration/moz.build
@@ -1,11 +1,8 @@
 # -*- 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 += ['public', 'src']
-
-XPCSHELL_TESTS_MANIFESTS += [
-    'tests/unit/xpcshell.ini',
-]
+TEST_DIRS += ['tests']
new file mode 100644
--- /dev/null
+++ b/browser/components/migration/tests/moz.build
@@ -0,0 +1,7 @@
+# -*- 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/.
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -16,16 +16,20 @@ PARALLEL_DIRS += [
     'search',
     'sessionstore',
     'shell',
     'sidebar',
     'tabview',
     'migration',
 ]
 
+if CONFIG['MOZ_SAFE_BROWSING']:
+    PARALLEL_DIRS += ['safebrowsing']
+
+TEST_DIRS += ['test']
 DIRS += ['build']
 
 XPIDL_SOURCES += [
     'nsIBrowserGlue.idl',
     'nsIBrowserHandler.idl',
 ]
 
 XPIDL_MODULE = 'browsercompsbase'
@@ -39,15 +43,8 @@ EXTRA_PP_COMPONENTS += [
     'nsBrowserContentHandler.js',
     'nsBrowserGlue.js',
 ]
 
 EXTRA_JS_MODULES += [
     'distribution.js',
 ]
 
-BROWSER_CHROME_MANIFESTS += [
-    'test/browser.ini'
-]
-
-if CONFIG['MOZ_SAFE_BROWSING']:
-    BROWSER_CHROME_MANIFESTS += ['safebrowsing/content/test/browser.ini']
-
--- a/browser/components/places/moz.build
+++ b/browser/components/places/moz.build
@@ -1,19 +1,9 @@
 # -*- 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 += ['src']
-
-XPCSHELL_TESTS_MANIFESTS += [
-    'tests/unit/xpcshell.ini',
-]
+TEST_DIRS += ['tests']
 
-MOCHITEST_CHROME_MANIFESTS += [
-    'tests/chrome/chrome.ini'
-]
-
-BROWSER_CHROME_MANIFESTS += [
-    'tests/browser/browser.ini',
-]
new file mode 100644
--- /dev/null
+++ b/browser/components/places/tests/browser/Makefile.in
@@ -0,0 +1,38 @@
+# 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_BROWSER_FILES = \
+	head.js \
+	browser_0_library_left_pane_migration.js \
+	browser_library_left_pane_fixnames.js \
+	browser_425884.js \
+	browser_475045.js \
+	browser_423515.js \
+	browser_410196_paste_into_tags.js \
+	browser_sort_in_library.js \
+	browser_library_open_leak.js \
+	browser_library_panel_leak.js \
+	browser_library_search.js \
+	browser_history_sidebar_search.js \
+	browser_bookmarksProperties.js \
+	$(filter disabled-for-very-frequent-oranges--bug-551540, browser_forgetthissite_single.js) \
+	browser_library_left_pane_commands.js \
+	browser_drag_bookmarks_on_toolbar.js \
+	browser_library_middleclick.js \
+	browser_library_views_liveupdate.js \
+	browser_views_liveupdate.js \
+	$(filter temporarily-disabled-for-breaking-the-treeview--bug-658744, browser_sidebarpanels_click.js) \
+	sidebarpanels_click_test_page.html \
+	browser_library_infoBox.js \
+	browser_markPageAsFollowedLink.js \
+	framedPage.html \
+	frameLeft.html \
+	frameRight.html \
+	browser_toolbar_migration.js \
+	browser_library_batch_delete.js \
+	browser_555547.js \
+	browser_416459_cut.js \
+	browser_library_downloads.js \
+	browser_library_left_pane_select_hierarchy.js \
+	$(NULL)
deleted file mode 100644
--- a/browser/components/places/tests/browser/browser.ini
+++ /dev/null
@@ -1,47 +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/.
-
-[DEFAULT]
-support-files =
-  head.js
-  framedPage.html
-  frameLeft.html
-  frameRight.html
-  sidebarpanels_click_test_page.html
-
-[browser_0_library_left_pane_migration.js]
-[browser_library_left_pane_fixnames.js]
-[browser_425884.js]
-[browser_475045.js]
-[browser_423515.js]
-[browser_410196_paste_into_tags.js]
-[browser_sort_in_library.js]
-[browser_library_open_leak.js]
-[browser_library_panel_leak.js]
-[browser_library_search.js]
-[browser_history_sidebar_search.js]
-[browser_bookmarksProperties.js]
-
-[browser_forgetthissite_single.js]
-# disabled for very frequent oranges - bug 551540
-skip-if = true
-
-[browser_library_left_pane_commands.js]
-[browser_drag_bookmarks_on_toolbar.js]
-[browser_library_middleclick.js]
-[browser_library_views_liveupdate.js]
-[browser_views_liveupdate.js]
-
-[browser_sidebarpanels_click.js]
-# temporarily disabled for breaking the treeview - bug 658744
-skip-if = true
-
-[browser_library_infoBox.js]
-[browser_markPageAsFollowedLink.js]
-[browser_toolbar_migration.js]
-[browser_library_batch_delete.js]
-[browser_555547.js]
-[browser_416459_cut.js]
-[browser_library_downloads.js]
-[browser_library_left_pane_select_hierarchy.js]
new file mode 100644
--- /dev/null
+++ b/browser/components/places/tests/browser/moz.build
@@ -0,0 +1,6 @@
+# -*- 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/.
+
new file mode 100644
--- /dev/null
+++ b/browser/components/places/tests/chrome/moz.build
@@ -0,0 +1,8 @@
+# -*- 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/.
+
+MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
+
new file mode 100644
--- /dev/null
+++ b/browser/components/places/tests/moz.build
@@ -0,0 +1,11 @@
+# -*- 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 += ['browser', 'chrome']
+
+MODULE = 'test_browser_places'
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
--- a/browser/components/preferences/in-content/moz.build
+++ b/browser/components/preferences/in-content/moz.build
@@ -1,6 +1,7 @@
 # -*- 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/.
 
+TEST_DIRS += ['tests']
new file mode 100644
--- /dev/null
+++ b/browser/components/preferences/in-content/tests/moz.build
@@ -0,0 +1,8 @@
+# -*- 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/.
+
+BROWSER_CHROME_MANIFESTS += ['browser.ini']
+
--- a/browser/components/preferences/moz.build
+++ b/browser/components/preferences/moz.build
@@ -1,12 +1,8 @@
 # -*- 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/.
 
 PARALLEL_DIRS += ['in-content']
-
-BROWSER_CHROME_MANIFESTS += [
-    'in-content/tests/browser.ini',
-    'tests/browser.ini',
-]
+TEST_DIRS += ['tests']
new file mode 100644
--- /dev/null
+++ b/browser/components/preferences/tests/moz.build
@@ -0,0 +1,8 @@
+# -*- 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/.
+
+BROWSER_CHROME_MANIFESTS += ['browser.ini']
+
--- a/browser/components/privatebrowsing/moz.build
+++ b/browser/components/privatebrowsing/moz.build
@@ -1,9 +1,10 @@
 # -*- 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/.
 
-BROWSER_CHROME_MANIFESTS += [
-    'test/browser/browser.ini',
-]
+TEST_DIRS += ['test']
+
+MODULE = 'privatebrowsing'
+
new file mode 100644
--- /dev/null
+++ b/browser/components/privatebrowsing/test/browser/moz.build
@@ -0,0 +1,10 @@
+# -*- 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/.
+
+MODULE = 'test_privatebrowsing'
+
+BROWSER_CHROME_MANIFESTS += ['browser.ini']
+
new file mode 100644
--- /dev/null
+++ b/browser/components/privatebrowsing/test/moz.build
@@ -0,0 +1,10 @@
+# -*- 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 += ['browser']
+
+MODULE = 'test_privatebrowsing'
+
new file mode 100644
--- /dev/null
+++ b/browser/components/safebrowsing/content/test/moz.build
@@ -0,0 +1,8 @@
+# -*- 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/.
+
+BROWSER_CHROME_MANIFESTS += ['browser.ini']
+
new file mode 100644
--- /dev/null
+++ b/browser/components/safebrowsing/moz.build
@@ -0,0 +1,8 @@
+# -*- 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/.
+
+TEST_DIRS += ['content/test']
+
--- a/browser/components/search/moz.build
+++ b/browser/components/search/moz.build
@@ -1,9 +1,7 @@
 # -*- 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/.
 
-BROWSER_CHROME_MANIFESTS += [
-    'test/browser.ini',
-]
+TEST_DIRS += ['test']
new file mode 100644
--- /dev/null
+++ b/browser/components/search/test/moz.build
@@ -0,0 +1,8 @@
+# -*- 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/.
+
+BROWSER_CHROME_MANIFESTS += ['browser.ini']
+
--- a/browser/components/sessionstore/moz.build
+++ b/browser/components/sessionstore/moz.build
@@ -1,22 +1,16 @@
 # -*- 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 += ['src']
+TEST_DIRS += ['test']
 
 XPIDL_SOURCES += [
     'nsISessionStartup.idl',
     'nsISessionStore.idl',
 ]
 
 MODULE = 'sessionstore'
 
-XPCSHELL_TESTS_MANIFESTS += [
-    'test/unit/xpcshell.ini',
-]
-
-BROWSER_CHROME_MANIFESTS += [
-    'test/browser.ini',
-]
new file mode 100644
--- /dev/null
+++ b/browser/components/sessionstore/test/Makefile.in
@@ -0,0 +1,165 @@
+# 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/.
+
+# browser_506482.js is disabled because of frequent failures (bug 538672)
+# browser_526613.js is disabled because of frequent failures (bug 534489)
+# browser_589246.js is disabled for leaking browser windows (bug 752467)
+# browser_580512.js is disabled for leaking browser windows (bug 752467)
+
+MOCHITEST_BROWSER_FILES = \
+	head.js \
+	browser_attributes.js \
+	browser_capabilities.js \
+	browser_dying_cache.js \
+	browser_form_restore_events.js \
+	browser_form_restore_events_sample.html \
+	browser_formdata_format.js \
+	browser_formdata_format_sample.html \
+	browser_input.js \
+	browser_input_sample.html \
+	browser_pageshow.js \
+	browser_sessionStorage.js \
+	browser_tabStateCache.js \
+	browser_upgrade_backup.js \
+	browser_windowRestore_perwindowpb.js \
+	browser_248970_b_perwindowpb.js \
+	browser_248970_b_sample.html \
+	browser_339445.js \
+	browser_339445_sample.html \
+	browser_345898.js \
+	browser_346337.js \
+	browser_346337_sample.html \
+	browser_350525.js \
+	browser_354894_perwindowpb.js \
+	browser_367052.js \
+	browser_393716.js \
+	browser_394759_basic.js \
+	browser_394759_behavior.js \
+	browser_394759_perwindowpb.js \
+	browser_394759_purge.js \
+	browser_408470.js \
+	browser_408470_sample.html \
+	browser_423132.js \
+	browser_423132_sample.html \
+	browser_447951.js \
+	browser_447951_sample.html \
+	browser_448741.js \
+	browser_454908.js \
+	browser_454908_sample.html \
+	browser_456342.js \
+	browser_456342_sample.xhtml \
+	browser_461634.js \
+	browser_463205.js \
+	browser_463205_helper.html \
+	browser_463205_sample.html \
+	browser_463206.js \
+	browser_463206_sample.html \
+	browser_464199.js \
+	browser_465215.js \
+	browser_465223.js \
+	browser_466937.js \
+	browser_466937_sample.html \
+	browser_467409-backslashplosion.js \
+	browser_477657.js \
+	browser_480148.js \
+	browser_480893.js \
+	browser_483330.js \
+	browser_485482.js \
+	browser_485482_sample.html \
+	browser_485563.js \
+	browser_490040.js \
+	browser_491168.js \
+	browser_491577.js \
+	browser_495495.js \
+	browser_500328.js \
+	browser_514751.js \
+	browser_522375.js \
+	browser_522545.js \
+	browser_524745.js \
+	browser_528776.js \
+	browser_579868.js \
+	browser_579879.js \
+	browser_581593.js \
+	browser_581937.js \
+	browser_586147.js \
+	browser_586068-apptabs.js \
+	browser_586068-apptabs_ondemand.js \
+	browser_586068-browser_state_interrupted.js \
+	browser_586068-cascade.js \
+	browser_586068-multi_window.js \
+	browser_586068-reload.js \
+	browser_586068-select.js \
+	browser_586068-window_state.js \
+	browser_586068-window_state_override.js \
+	browser_588426.js \
+	browser_590268.js \
+	browser_590563.js \
+	browser_595601-restore_hidden.js \
+	browser_597315.js \
+	browser_597315_index.html \
+	browser_597315_a.html \
+	browser_597315_b.html \
+	browser_597315_c.html \
+	browser_597315_c1.html \
+	browser_597315_c2.html \
+	browser_599909.js \
+	browser_600545.js \
+	browser_601955.js \
+	browser_607016.js \
+	browser_615394-SSWindowState_events.js \
+	browser_618151.js \
+	browser_623779.js \
+	browser_624727.js \
+	browser_625257.js \
+	browser_628270.js \
+	browser_635418.js \
+	browser_636279.js \
+	browser_637020.js \
+	browser_637020_slow.sjs \
+	browser_644409-scratchpads.js \
+	browser_645428.js \
+	browser_659591.js \
+	browser_662743.js \
+	browser_662743_sample.html \
+	browser_662812.js \
+	browser_665702-state_session.js \
+	browser_682507.js \
+	browser_687710.js \
+	browser_687710_2.js \
+	browser_694378.js \
+	browser_701377.js \
+	browser_705597.js \
+	browser_707862.js \
+	browser_739531.js \
+	browser_739531_sample.html \
+	browser_739805.js \
+	browser_819510_perwindowpb.js \
+	browser_833286_atomic_backup.js \
+	browser_916390_form_data_loss.js \
+	browser_916390_sample.html \
+	$(filter disabled-for-intermittent-failures--bug-766044, browser_459906_empty.html) \
+	$(filter disabled-for-intermittent-failures--bug-766044, browser_459906_sample.html) \
+	$(filter disabled-for-intermittent-failures--bug-765389, browser_461743_sample.html) \
+	$(NULL)
+
+# Disabled on Windows for frequent intermittent failures
+ifneq ($(OS_ARCH), WINNT)
+MOCHITEST_FILES += \
+	browser_464620_a.js \
+	browser_464620_a.html \
+	browser_464620_b.js \
+	browser_464620_b.html \
+	browser_464620_xd.html \
+	$(NULL)
+else
+$(filter disabled-for-intermittent-failures-on-windows--bug-552424, browser_464620_a.js)
+$(filter disabled-for-intermittent-failures-on-windows--bug-552424, browser_464620_b.js)
+endif
+
+ifneq ($(OS_ARCH),Darwin)
+MOCHITEST_BROWSER_FILES += \
+	browser_597071.js \
+	browser_625016.js \
+	$(NULL)
+endif
deleted file mode 100644
--- a/browser/components/sessionstore/test/browser.ini
+++ /dev/null
@@ -1,164 +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/.
-
-# browser_506482.js is disabled because of frequent failures (bug 538672)
-# browser_526613.js is disabled because of frequent failures (bug 534489)
-# browser_589246.js is disabled for leaking browser windows (bug 752467)
-# browser_580512.js is disabled for leaking browser windows (bug 752467)
-
-[DEFAULT]
-support-files =
-  head.js
-  browser_form_restore_events_sample.html
-  browser_formdata_format_sample.html
-  browser_input_sample.html
-  browser_248970_b_sample.html
-  browser_339445_sample.html
-  browser_346337_sample.html
-  browser_408470_sample.html
-  browser_423132_sample.html
-  browser_447951_sample.html
-  browser_454908_sample.html
-  browser_456342_sample.xhtml
-  browser_463205_helper.html
-  browser_463205_sample.html
-  browser_463206_sample.html
-  browser_466937_sample.html
-  browser_485482_sample.html
-  browser_597315_index.html
-  browser_597315_a.html
-  browser_597315_b.html
-  browser_597315_c.html
-  browser_597315_c1.html
-  browser_597315_c2.html
-  browser_662743_sample.html
-  browser_739531_sample.html
-  browser_916390_sample.html
-#NB: the following are disabled on Windows:
-  browser_464620_a.html
-  browser_464620_b.html 
-  browser_464620_xd.html
-
-
-#disabled-for-intermittent-failures--bug-766044, browser_459906_empty.html
-#disabled-for-intermittent-failures--bug-766044, browser_459906_sample.html
-#disabled-for-intermittent-failures--bug-765389, browser_461743_sample.html
-
-[browser_attributes.js]
-[browser_capabilities.js]
-[browser_dying_cache.js]
-[browser_form_restore_events.js]
-[browser_formdata_format.js]
-[browser_input.js]
-[browser_pageshow.js]
-[browser_sessionStorage.js]
-[browser_tabStateCache.js]
-[browser_upgrade_backup.js]
-[browser_windowRestore_perwindowpb.js]
-[browser_248970_b_perwindowpb.js]
-[browser_339445.js]
-[browser_345898.js]
-[browser_346337.js]
-[browser_350525.js]
-[browser_354894_perwindowpb.js]
-[browser_367052.js]
-[browser_393716.js]
-[browser_394759_basic.js]
-[browser_394759_behavior.js]
-[browser_394759_perwindowpb.js]
-[browser_394759_purge.js]
-[browser_408470.js]
-[browser_423132.js]
-[browser_447951.js]
-[browser_448741.js]
-[browser_454908.js]
-[browser_456342.js]
-[browser_461634.js]
-[browser_463205.js]
-[browser_463206.js]
-[browser_464199.js]
-[browser_465215.js]
-[browser_465223.js]
-[browser_466937.js]
-[browser_467409-backslashplosion.js]
-[browser_477657.js]
-[browser_480148.js]
-[browser_480893.js]
-[browser_483330.js]
-[browser_485482.js]
-[browser_485563.js]
-[browser_490040.js]
-[browser_491168.js]
-[browser_491577.js]
-[browser_495495.js]
-[browser_500328.js]
-[browser_514751.js]
-[browser_522375.js]
-[browser_522545.js]
-[browser_524745.js]
-[browser_528776.js]
-[browser_579868.js]
-[browser_579879.js]
-[browser_581593.js]
-[browser_581937.js]
-[browser_586147.js]
-[browser_586068-apptabs.js]
-[browser_586068-apptabs_ondemand.js]
-[browser_586068-browser_state_interrupted.js]
-[browser_586068-cascade.js]
-[browser_586068-multi_window.js]
-[browser_586068-reload.js]
-[browser_586068-select.js]
-[browser_586068-window_state.js]
-[browser_586068-window_state_override.js]
-[browser_588426.js]
-[browser_590268.js]
-[browser_590563.js]
-[browser_595601-restore_hidden.js]
-[browser_597315.js]
-[browser_599909.js]
-[browser_600545.js]
-[browser_601955.js]
-[browser_607016.js]
-[browser_615394-SSWindowState_events.js]
-[browser_618151.js]
-[browser_623779.js]
-[browser_624727.js]
-[browser_625257.js]
-[browser_628270.js]
-[browser_635418.js]
-[browser_636279.js]
-[browser_637020.js]
-[browser_637020_slow.sjs]
-[browser_644409-scratchpads.js]
-[browser_645428.js]
-[browser_659591.js]
-[browser_662743.js]
-[browser_662812.js]
-[browser_665702-state_session.js]
-[browser_682507.js]
-[browser_687710.js]
-[browser_687710_2.js]
-[browser_694378.js]
-[browser_701377.js]
-[browser_705597.js]
-[browser_707862.js]
-[browser_739531.js]
-[browser_739805.js]
-[browser_819510_perwindowpb.js]
-[browser_833286_atomic_backup.js]
-[browser_916390_form_data_loss.js]
-
-# Disabled on Windows for frequent intermittent failures
-[browser_464620_a.js]
-skip-if = os == "win"
-[browser_464620_b.js]
-skip-if = os == "win"
-
-# Disabled on OS X:
-[browser_597071.js]
-skip-if = os == "mac"
-[browser_625016.js]
-skip-if = os == "mac"
-
new file mode 100644
--- /dev/null
+++ b/browser/components/sessionstore/test/moz.build
@@ -0,0 +1,7 @@
+# -*- 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/.
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
--- a/browser/components/shell/moz.build
+++ b/browser/components/shell/moz.build
@@ -1,15 +1,8 @@
 # -*- 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 += ['public', 'src']
-
-XPCSHELL_TESTS_MANIFESTS += [
-    'test/unit/xpcshell.ini'
-]
-
-BROWSER_CHROME_MANIFESTS += [
-    'test/browser.ini',
-]
+TEST_DIRS += ['test']
new file mode 100644
--- /dev/null
+++ b/browser/components/shell/test/moz.build
@@ -0,0 +1,12 @@
+# -*- 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/.
+
+MODULE = 'test_browser_shell'
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
+BROWSER_CHROME_MANIFESTS += ['browser.ini']
+
new file mode 100644
--- /dev/null
+++ b/browser/components/tabview/Makefile.in
@@ -0,0 +1,9 @@
+#
+# 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/.
+
+include $(topsrcdir)/config/rules.mk
+
+libs::
+	$(NSINSTALL) $(srcdir)/modules/* $(FINAL_TARGET)/modules/tabview
--- a/browser/components/tabview/moz.build
+++ b/browser/components/tabview/moz.build
@@ -1,12 +1,7 @@
 # -*- 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/.
 
-EXTRA_JS_MODULES = ['modules/utils.jsm']
-JS_MODULES_PATH  = 'modules/tabview'
-
-BROWSER_CHROME_MANIFESTS += [
-    'test/browser.ini',
-]
+TEST_DIRS += ['test']
new file mode 100644
--- /dev/null
+++ b/browser/components/tabview/test/moz.build
@@ -0,0 +1,8 @@
+# -*- 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/.
+
+BROWSER_CHROME_MANIFESTS += ['browser.ini']
+
new file mode 100644
--- /dev/null
+++ b/browser/components/test/moz.build
@@ -0,0 +1,8 @@
+# -*- 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/.
+
+BROWSER_CHROME_MANIFESTS += ['browser.ini']
+
--- a/browser/devtools/app-manager/webapps-store.js
+++ b/browser/devtools/app-manager/webapps-store.js
@@ -253,20 +253,16 @@ WebappsStore.prototype = {
       }
 
       request.type = "getIconAsDataURL";
       client.request(request, (res) => {
         if (res.url) {
           proxifiedApp.iconURL = res.url;
         }
       });
-
-      // This app may have been running while being installed, so check the list
-      // of running apps again to get the right answer.
-      this._getRunningApps();
     });
   },
 
   _onAppUninstall: function(manifest) {
     this.object.all = this.object.all.filter((app) => {
       return (app.manifestURL != manifest);
     });
   },
--- a/browser/devtools/framework/connect/connect.xhtml
+++ b/browser/devtools/framework/connect/connect.xhtml
@@ -40,11 +40,11 @@
       <p>&availableTabs;</p>
       <ul class="actors" id="tabActors"></ul>
       <p>&availableProcesses;</p>
       <ul class="actors" id="globalActors"></ul>
     </section>
     <section id="connecting">
       <p><img src="chrome://browser/skin/tabbrowser/loading.png"></img> &connecting;</p>
     </section>
-    <footer>&remoteHelp;<a target='_' href='https://developer.mozilla.org/docs/Tools/Remote_Debugging'>&remoteDocumentation;</a>&remoteHelpSuffix;</footer>
+    <footer>&help2;</footer>
   </body>
 </html>
--- a/browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd
@@ -14,16 +14,9 @@
 <!ENTITY connect    "Connect">
 <!ENTITY connecting "Connecting…">
 <!ENTITY availableTabs "Available remote tabs:">
 <!ENTITY availableProcesses "Available remote processes:">
 <!ENTITY connectionError "Error:">
 <!ENTITY errorTimeout "Error: connection timeout.">
 <!ENTITY errorRefused "Error: connection refused.">
 <!ENTITY errorUnexpected "Unexpected error.">
-
-<!-- LOCALIZATION NOTE (remoteHelp, remoteDocumentation, remoteHelpSuffix):
-these strings will be concatenated in a single label, remoteDocumentation will
-be used as text for a link to MDN. -->
-<!ENTITY remoteHelp "Firefox Developer Tools can debug remote devices (Firefox for Android and Firefox OS, for example). Make sure that you have turned on the 'Remote debugging' option in the remote device. For more, see the">
-<!ENTITY remoteDocumentation "documentation">
-<!ENTITY remoteHelpSuffix ".">
-
+<!ENTITY help2 "Firefox Developer Tools can debug remote devices (Firefox for Android and Firefox OS, for example). Make sure that you have turned on the 'Remote debugging' option in the remote device. See the <a target='_' href='https://developer.mozilla.org/docs/Tools/Remote_Debugging'>documentation</a> for more.">
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -3338,81 +3338,16 @@
     "description": "The PDF document compression stream types used"
   },
   "PDF_VIEWER_TIME_TO_VIEW_MS": {
     "kind": "exponential",
     "high": "10000",
     "n_buckets": 50,
     "description": "Time spent to display first page in PDF Viewer (ms)"
   },
-  "SHUMWAY_TIME_TO_VIEW_MS": {
-    "kind": "exponential",
-    "high": "2 * 60 * 1000",
-    "n_buckets": 50,
-    "description": "Time spent to display first frame (ms)"
-  },
-  "SHUMWAY_PARSING_MS": {
-    "kind": "exponential",
-    "high": "2 * 60 * 1000",
-    "n_buckets": 50,
-    "description": "Time spent to parse SWF file (ms)"
-  },
-  "SHUMWAY_SWF_INDEX_ON_PAGE": {
-    "kind": "enumerated",
-    "n_values": 30,
-    "description": "Index of the SWF on the page (0 - full page, 1 - first, 2 - second, etc.)"
-  },
-  "SHUMWAY_SWF_SIZE_KB": {
-    "kind": "exponential",
-    "low": "1",
-    "high": "256 * 1024",
-    "n_buckets": 50,
-    "description": "The SWF file size (KB)"
-  },
-  "SHUMWAY_SWF_VERSION": {
-    "kind": "enumerated",
-    "n_values": 30,
-    "description": "The SWF file version"
-  },
-  "SHUMWAY_SWF_FRAME_RATE": {
-    "kind": "linear",
-    "high": "256",
-    "n_buckets": "50",
-    "description": "The SWF file frame rate"
-  },
-  "SHUMWAY_SWF_AREA": {
-    "kind": "exponential",
-    "low": "256",
-    "high": "16777216",
-    "n_buckets": 50,
-    "description": "The SWF file dimension: amount of pixels (width * height)"
-  },
-  "SHUMWAY_SWF_AVM2": {
-    "kind": "boolean",
-    "description": "The AVM2 is enabled in the SWF file"
-  },
-  "SHUMWAY_SWF_BANNER": {
-    "kind": "enumerated",
-    "n_values": 30,
-    "description": "The well-known banner size"
-  },
-  "SHUMWAY_ERROR": {
-    "kind": "enumerated",
-    "n_values": 3,
-    "description": "The Shumway reported error: 0 - unknown, 1 - AVM1, 2 - AVM2)"
-  },
-  "SHUMWAY_FEATURE_USED": {
-    "kind": "enumerated",
-    "n_values": 700,
-    "description": "The Shumway feature is used during movie execution"
-  },
-  "SHUMWAY_FALLBACK": {
-    "kind": "boolean",
-    "description": "The Shumway was selected to fallback to the Flash (false - by heuristics, true - by user)"
-  },
   "PLUGINS_NOTIFICATION_SHOWN": {
     "kind": "boolean",
     "description": "The number of times the click-to-activate notification was shown: false: shown by in-content activation true: shown by location bar activation"
   },
   "PLUGINS_NOTIFICATION_PLUGIN_COUNT": {
     "kind": "enumerated",
     "n_values": 5,
     "description": "The number of plugins present in the click-to-activate notification, minus one (1, 2, 3, 4, more than 4)"
--- a/toolkit/devtools/server/actors/root.js
+++ b/toolkit/devtools/server/actors/root.js
@@ -186,27 +186,16 @@ RootActor.prototype = {
   get isRootActor() true,
 
   /**
    * The (chrome) window, for use by child actors
    */
   get window() Services.wm.getMostRecentWindow(DebuggerServer.chromeWindowType),
 
   /**
-   * Getter for the best nsIWebProgress for to watching this window.
-   */
-  get webProgress() {
-    return this.window
-      .QueryInterface(Ci.nsIInterfaceRequestor)
-      .getInterface(Ci.nsIDocShell)
-      .QueryInterface(Ci.nsIInterfaceRequestor)
-      .getInterface(Ci.nsIWebProgress);
-  },
-
-  /**
    * Disconnects the actor from the browser window.
    */
   disconnect: function() {
     /* Tell the live lists we aren't watching any more. */
     if (this._parameters.tabList) {
       this._parameters.tabList.onListChanged = null;
     }
     if (this._parameters.addonList) {