--- a/browser/components/about/AboutRedirector.cpp
+++ b/browser/components/about/AboutRedirector.cpp
@@ -86,17 +86,17 @@ static const RedirEntry kRedirMap[] = {
     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
     nsIAboutModule::URI_MUST_LOAD_IN_CHILD |
     nsIAboutModule::ALLOW_SCRIPT |
     nsIAboutModule::MAKE_LINKABLE |
     nsIAboutModule::ENABLE_INDEXED_DB },
   // the newtab's actual URL will be determined when the channel is created
   { "newtab", "about:blank",
     nsIAboutModule::ALLOW_SCRIPT },
-  { "preferences", "chrome://browser/content/preferences/in-content/preferences.xul",
+  { "preferences", "chrome://browser/content/preferences/in-content-new/preferences.xul",
     nsIAboutModule::ALLOW_SCRIPT },
   { "downloads", "chrome://browser/content/downloads/contentAreaDownloadsView.xul",
     nsIAboutModule::ALLOW_SCRIPT },
 #ifdef MOZ_SERVICES_HEALTHREPORT
   { "healthreport", "chrome://browser/content/abouthealthreport/abouthealth.xhtml",
     nsIAboutModule::ALLOW_SCRIPT },
 #endif
   { "accounts", "chrome://browser/content/aboutaccounts/aboutaccounts.xhtml",

--- a/browser/components/preferences/applicationManager.xul
+++ b/browser/components/preferences/applicationManager.xul
@@ -17,17 +17,17 @@
         style="&appManager.style;"
         persist="screenX screenY">
 
   <script type="application/javascript"
           src="chrome://browser/content/utilityOverlay.js"/>
   <script type="application/javascript"
           src="chrome://browser/content/preferences/applicationManager.js"/>
   <script type="application/javascript"
-          src="chrome://browser/content/preferences/in-content/applications.js"/>
+          src="chrome://browser/content/preferences/in-content-new/applications.js"/>
 
   <commandset id="appManagerCommandSet">
     <command id="cmd_remove"
              oncommand="gAppManagerDialog.remove();"
              disabled="true"/>
   </commandset>
 
   <keyset id="appManagerKeyset">

rename from browser/components/preferences/in-content/advanced.js
rename to browser/components/preferences/in-content-new/advanced.js

rename from browser/components/preferences/in-content/advanced.xul
rename to browser/components/preferences/in-content-new/advanced.xul
--- a/browser/components/preferences/in-content/advanced.xul
+++ b/browser/components/preferences/in-content-new/advanced.xul
@@ -4,17 +4,17 @@
 
 <!-- Advanced panel -->
 
 #ifdef MOZ_UPDATER
   <script type="application/javascript" src="chrome://browser/content/aboutDialog-appUpdater.js"/>
 #endif
 
 <script type="application/javascript"
-        src="chrome://browser/content/preferences/in-content/advanced.js"/>
+        src="chrome://browser/content/preferences/in-content-new/advanced.js"/>
 
 <preferences id="advancedPreferences" hidden="true" data-category="paneAdvanced">
   <preference id="browser.preferences.advanced.selectedTabIndex"
               name="browser.preferences.advanced.selectedTabIndex"
               type="int"/>
 
 <!-- Update tab -->
 #ifdef MOZ_UPDATER

rename from browser/components/preferences/in-content/applications.js
rename to browser/components/preferences/in-content-new/applications.js

rename from browser/components/preferences/in-content/applications.xul
rename to browser/components/preferences/in-content-new/applications.xul
--- a/browser/components/preferences/in-content/applications.xul
+++ b/browser/components/preferences/in-content-new/applications.xul
@@ -1,16 +1,16 @@
 # 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/.
 
 <!-- Applications panel -->
 
 <script type="application/javascript"
-        src="chrome://browser/content/preferences/in-content/applications.js"/>
+        src="chrome://browser/content/preferences/in-content-new/applications.js"/>
 
 <preferences id="feedsPreferences" hidden="true" data-category="paneApplications">
   <preference id="browser.feeds.handler"
               name="browser.feeds.handler"
               type="string"/>
   <preference id="browser.feeds.handler.default"
               name="browser.feeds.handler.default"
               type="string"/>

rename from browser/components/preferences/in-content/containers.js
rename to browser/components/preferences/in-content-new/containers.js

rename from browser/components/preferences/in-content/containers.xul
rename to browser/components/preferences/in-content-new/containers.xul
--- a/browser/components/preferences/in-content/containers.xul
+++ b/browser/components/preferences/in-content-new/containers.xul
@@ -1,16 +1,16 @@
 # 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/.
 
 <!-- Containers panel -->
 
 <script type="application/javascript"
-        src="chrome://browser/content/preferences/in-content/containers.js"/>
+        src="chrome://browser/content/preferences/in-content-new/containers.js"/>
 
 <preferences id="containerPreferences" hidden="true" data-category="paneContainer">
   <!-- Containers -->
   <preference id="privacy.userContext.enabled"
               name="privacy.userContext.enabled"
               type="bool"/>
 
 </preferences>

rename from browser/components/preferences/in-content/findInPage.js
rename to browser/components/preferences/in-content-new/findInPage.js

rename from browser/components/preferences/in-content/jar.mn
rename to browser/components/preferences/in-content-new/jar.mn
--- a/browser/components/preferences/in-content/jar.mn
+++ b/browser/components/preferences/in-content-new/jar.mn
@@ -1,16 +1,16 @@
 # 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.jar:
-   content/browser/preferences/in-content/preferences.js
-*  content/browser/preferences/in-content/preferences.xul
-   content/browser/preferences/in-content/subdialogs.js
+   content/browser/preferences/in-content-new/preferences.js
+*  content/browser/preferences/in-content-new/preferences.xul
+   content/browser/preferences/in-content-new/subdialogs.js
 
-   content/browser/preferences/in-content/main.js
-   content/browser/preferences/in-content/privacy.js
-   content/browser/preferences/in-content/containers.js
-   content/browser/preferences/in-content/advanced.js
-   content/browser/preferences/in-content/applications.js
-   content/browser/preferences/in-content/sync.js
-   content/browser/preferences/in-content/findInPage.js
+   content/browser/preferences/in-content-new/main.js
+   content/browser/preferences/in-content-new/privacy.js
+   content/browser/preferences/in-content-new/containers.js
+   content/browser/preferences/in-content-new/advanced.js
+   content/browser/preferences/in-content-new/applications.js
+   content/browser/preferences/in-content-new/sync.js
+   content/browser/preferences/in-content-new/findInPage.js

rename from browser/components/preferences/in-content/main.js
rename to browser/components/preferences/in-content-new/main.js

rename from browser/components/preferences/in-content/main.xul
rename to browser/components/preferences/in-content-new/main.xul
--- a/browser/components/preferences/in-content/main.xul
+++ b/browser/components/preferences/in-content-new/main.xul
@@ -1,16 +1,16 @@
 # 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/.
 
 <!-- General panel -->
 
 <script type="application/javascript"
-        src="chrome://browser/content/preferences/in-content/main.js"/>
+        src="chrome://browser/content/preferences/in-content-new/main.js"/>
 
 <script type="application/javascript"
         src="chrome://mozapps/content/preferences/fontbuilder.js"/>
 
 <stringbundle id="engineManagerBundle" src="chrome://browser/locale/engineManager.properties"/>
 
 <stringbundle id="bundlePreferences" src="chrome://browser/locale/preferences.properties"/>
 

rename from browser/components/preferences/in-content/moz.build
rename to browser/components/preferences/in-content-new/moz.build

rename from browser/components/preferences/in-content/preferences.js
rename to browser/components/preferences/in-content-new/preferences.js

rename from browser/components/preferences/in-content/preferences.xul
rename to browser/components/preferences/in-content-new/preferences.xul
--- a/browser/components/preferences/in-content/preferences.xul
+++ b/browser/components/preferences/in-content-new/preferences.xul
@@ -3,22 +3,22 @@
    - 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/. -->
 
 <?xml-stylesheet href="chrome://global/skin/global.css"?>
 
 <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
 <?xml-stylesheet href="chrome://global/skin/in-content/common.css"?>
 <?xml-stylesheet
-  href="chrome://browser/skin/preferences/in-content/preferences.css"?>
+  href="chrome://browser/skin/preferences/in-content-new/preferences.css"?>
 <?xml-stylesheet
   href="chrome://browser/content/preferences/handlers.css"?>
 <?xml-stylesheet href="chrome://browser/skin/preferences/applications.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/search.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/containers.css"?>
+<?xml-stylesheet href="chrome://browser/skin/preferences/in-content-new/search.css"?>
+<?xml-stylesheet href="chrome://browser/skin/preferences/in-content-new/containers.css"?>
 
 <!DOCTYPE page [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 <!ENTITY % globalPreferencesDTD SYSTEM "chrome://global/locale/preferences.dtd">
 <!ENTITY % preferencesDTD SYSTEM
   "chrome://browser/locale/preferences/preferences.dtd">
 <!ENTITY % selectBookmarkDTD SYSTEM
   "chrome://browser/locale/preferences/selectBookmark.dtd">
@@ -90,24 +90,24 @@
       disablefastfind="true"
 #ifdef USE_WIN_TITLE_STYLE
       title="&prefWindow.titleWin;">
 #else
       title="&prefWindow.title;">
 #endif
 
   <html:link rel="shortcut icon"
-              href="chrome://browser/skin/preferences/in-content/favicon.ico"/>
+              href="chrome://browser/skin/preferences/in-content-new/favicon.ico"/>
 
   <script type="application/javascript"
           src="chrome://browser/content/utilityOverlay.js"/>
   <script type="application/javascript"
-          src="chrome://browser/content/preferences/in-content/preferences.js"/>
-  <script src="chrome://browser/content/preferences/in-content/findInPage.js"/>
-  <script src="chrome://browser/content/preferences/in-content/subdialogs.js"/>
+          src="chrome://browser/content/preferences/in-content-new/preferences.js"/>
+  <script src="chrome://browser/content/preferences/in-content-new/findInPage.js"/>
+  <script src="chrome://browser/content/preferences/in-content-new/subdialogs.js"/>
 
   <stringbundle id="bundleBrand"
                 src="chrome://branding/locale/brand.properties"/>
   <stringbundle id="bundlePreferences"
                 src="chrome://browser/locale/preferences/preferences.properties"/>
   <stringbundle id="pkiBundle"
                 src="chrome://pippki/locale/pippki.properties"/>
   <stringbundle id="browserBundle"

rename from browser/components/preferences/in-content/privacy.js
rename to browser/components/preferences/in-content-new/privacy.js

rename from browser/components/preferences/in-content/privacy.xul
rename to browser/components/preferences/in-content-new/privacy.xul
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content-new/privacy.xul
@@ -1,16 +1,16 @@
 # 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/.
 
 <!-- Privacy panel -->
 
 <script type="application/javascript"
-        src="chrome://browser/content/preferences/in-content/privacy.js"/>
+        src="chrome://browser/content/preferences/in-content-new/privacy.js"/>
 
 <preferences id="privacyPreferences" hidden="true" data-category="panePrivacy">
 
   <!-- Tracking -->
   <preference id="privacy.trackingprotection.enabled"
               name="privacy.trackingprotection.enabled"
               type="bool"/>
   <preference id="privacy.trackingprotection.pbmode.enabled"

rename from browser/components/preferences/in-content/searchResults.xul
rename to browser/components/preferences/in-content-new/searchResults.xul

rename from browser/components/preferences/in-content/subdialogs.js
rename to browser/components/preferences/in-content-new/subdialogs.js
--- a/browser/components/preferences/in-content/subdialogs.js
+++ b/browser/components/preferences/in-content-new/subdialogs.js
@@ -13,18 +13,18 @@ var gSubDialog = {
   _isClosing: false,
   _frame: null,
   _overlay: null,
   _box: null,
   _openedURL: null,
   _injectedStyleSheets: [
     "chrome://browser/skin/preferences/preferences.css",
     "chrome://global/skin/in-content/common.css",
-    "chrome://browser/skin/preferences/in-content/preferences.css",
-    "chrome://browser/skin/preferences/in-content/dialog.css",
+    "chrome://browser/skin/preferences/in-content-new/preferences.css",
+    "chrome://browser/skin/preferences/in-content-new/dialog.css",
   ],
   _resizeObserver: null,
 
   init() {
     this._frame = document.getElementById("dialogFrame");
     this._overlay = document.getElementById("dialogOverlay");
     this._box = document.getElementById("dialogBox");
     this._closeButton = document.getElementById("dialogClose");

rename from browser/components/preferences/in-content/sync.js
rename to browser/components/preferences/in-content-new/sync.js

rename from browser/components/preferences/in-content/sync.xul
rename to browser/components/preferences/in-content-new/sync.xul
--- a/browser/components/preferences/in-content/sync.xul
+++ b/browser/components/preferences/in-content-new/sync.xul
@@ -21,17 +21,17 @@
               name="services.sync.engine.prefs"
               type="bool"/>
   <preference id="engine.passwords"
               name="services.sync.engine.passwords"
               type="bool"/>
 </preferences>
 
 <script type="application/javascript"
-        src="chrome://browser/content/preferences/in-content/sync.js"/>
+        src="chrome://browser/content/preferences/in-content-new/sync.js"/>
 
 <hbox id="header-sync"
       class="header"
       hidden="true"
       data-category="paneSync">
   <label class="header-name" flex="1">&paneSync1.title;</label>
 </hbox>
 

rename from browser/components/preferences/in-content/tests/.eslintrc.js
rename to browser/components/preferences/in-content-new/tests/.eslintrc.js

rename from browser/components/preferences/in-content/tests/browser.ini
rename to browser/components/preferences/in-content-new/tests/browser.ini

rename from browser/components/preferences/in-content/tests/browser_advanced_update.js
rename to browser/components/preferences/in-content-new/tests/browser_advanced_update.js

rename from browser/components/preferences/in-content/tests/browser_applications_selection.js
rename to browser/components/preferences/in-content-new/tests/browser_applications_selection.js

rename from browser/components/preferences/in-content/tests/browser_basic_rebuild_fonts_test.js
rename to browser/components/preferences/in-content-new/tests/browser_basic_rebuild_fonts_test.js

rename from browser/components/preferences/in-content/tests/browser_bug1018066_resetScrollPosition.js
rename to browser/components/preferences/in-content-new/tests/browser_bug1018066_resetScrollPosition.js

rename from browser/components/preferences/in-content/tests/browser_bug1020245_openPreferences_to_paneContent.js
rename to browser/components/preferences/in-content-new/tests/browser_bug1020245_openPreferences_to_paneContent.js

rename from browser/components/preferences/in-content/tests/browser_bug1184989_prevent_scrolling_when_preferences_flipped.js
rename to browser/components/preferences/in-content-new/tests/browser_bug1184989_prevent_scrolling_when_preferences_flipped.js

rename from browser/components/preferences/in-content/tests/browser_bug1184989_prevent_scrolling_when_preferences_flipped.xul
rename to browser/components/preferences/in-content-new/tests/browser_bug1184989_prevent_scrolling_when_preferences_flipped.xul

rename from browser/components/preferences/in-content/tests/browser_bug410900.js
rename to browser/components/preferences/in-content-new/tests/browser_bug410900.js

rename from browser/components/preferences/in-content/tests/browser_bug705422.js
rename to browser/components/preferences/in-content-new/tests/browser_bug705422.js

rename from browser/components/preferences/in-content/tests/browser_bug731866.js
rename to browser/components/preferences/in-content-new/tests/browser_bug731866.js

rename from browser/components/preferences/in-content/tests/browser_bug795764_cachedisabled.js
rename to browser/components/preferences/in-content-new/tests/browser_bug795764_cachedisabled.js

rename from browser/components/preferences/in-content/tests/browser_change_app_handler.js
rename to browser/components/preferences/in-content-new/tests/browser_change_app_handler.js

rename from browser/components/preferences/in-content/tests/browser_checkspelling.js
rename to browser/components/preferences/in-content-new/tests/browser_checkspelling.js

rename from browser/components/preferences/in-content/tests/browser_connection.js
rename to browser/components/preferences/in-content-new/tests/browser_connection.js

rename from browser/components/preferences/in-content/tests/browser_connection_bug388287.js
rename to browser/components/preferences/in-content-new/tests/browser_connection_bug388287.js

rename from browser/components/preferences/in-content/tests/browser_cookies_exceptions.js
rename to browser/components/preferences/in-content-new/tests/browser_cookies_exceptions.js

rename from browser/components/preferences/in-content/tests/browser_defaultbrowser_alwayscheck.js
rename to browser/components/preferences/in-content-new/tests/browser_defaultbrowser_alwayscheck.js

rename from browser/components/preferences/in-content/tests/browser_engines.js
rename to browser/components/preferences/in-content-new/tests/browser_engines.js

rename from browser/components/preferences/in-content/tests/browser_healthreport.js
rename to browser/components/preferences/in-content-new/tests/browser_healthreport.js

rename from browser/components/preferences/in-content/tests/browser_homepages_filter_aboutpreferences.js
rename to browser/components/preferences/in-content-new/tests/browser_homepages_filter_aboutpreferences.js

rename from browser/components/preferences/in-content/tests/browser_layersacceleration.js
rename to browser/components/preferences/in-content-new/tests/browser_layersacceleration.js

rename from browser/components/preferences/in-content/tests/browser_masterpassword.js
rename to browser/components/preferences/in-content-new/tests/browser_masterpassword.js

rename from browser/components/preferences/in-content/tests/browser_notifications_do_not_disturb.js
rename to browser/components/preferences/in-content-new/tests/browser_notifications_do_not_disturb.js

rename from browser/components/preferences/in-content/tests/browser_performance.js
rename to browser/components/preferences/in-content-new/tests/browser_performance.js

rename from browser/components/preferences/in-content/tests/browser_permissions_urlFieldHidden.js
rename to browser/components/preferences/in-content-new/tests/browser_permissions_urlFieldHidden.js

rename from browser/components/preferences/in-content/tests/browser_privacypane_1.js
rename to browser/components/preferences/in-content-new/tests/browser_privacypane_1.js

rename from browser/components/preferences/in-content/tests/browser_privacypane_3.js
rename to browser/components/preferences/in-content-new/tests/browser_privacypane_3.js

rename from browser/components/preferences/in-content/tests/browser_privacypane_4.js
rename to browser/components/preferences/in-content-new/tests/browser_privacypane_4.js

rename from browser/components/preferences/in-content/tests/browser_privacypane_5.js
rename to browser/components/preferences/in-content-new/tests/browser_privacypane_5.js

rename from browser/components/preferences/in-content/tests/browser_privacypane_8.js
rename to browser/components/preferences/in-content-new/tests/browser_privacypane_8.js

rename from browser/components/preferences/in-content/tests/browser_proxy_backup.js
rename to browser/components/preferences/in-content-new/tests/browser_proxy_backup.js

rename from browser/components/preferences/in-content/tests/browser_sanitizeOnShutdown_prefLocked.js
rename to browser/components/preferences/in-content-new/tests/browser_sanitizeOnShutdown_prefLocked.js

rename from browser/components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_1.js
rename to browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_1.js

rename from browser/components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_2.js
rename to browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_2.js

rename from browser/components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_3.js
rename to browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_3.js

rename from browser/components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_4.js
rename to browser/components/preferences/in-content-new/tests/browser_search_subdialogs_within_preferences_4.js

rename from browser/components/preferences/in-content/tests/browser_search_within_preferences.js
rename to browser/components/preferences/in-content-new/tests/browser_search_within_preferences.js

rename from browser/components/preferences/in-content/tests/browser_searchsuggestions.js
rename to browser/components/preferences/in-content-new/tests/browser_searchsuggestions.js

rename from browser/components/preferences/in-content/tests/browser_security.js
rename to browser/components/preferences/in-content-new/tests/browser_security.js

rename from browser/components/preferences/in-content/tests/browser_siteData.js
rename to browser/components/preferences/in-content-new/tests/browser_siteData.js
--- a/browser/components/preferences/in-content/tests/browser_siteData.js
+++ b/browser/components/preferences/in-content-new/tests/browser_siteData.js
@@ -6,20 +6,20 @@
 const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 /* import-globals-from ../../../../../testing/modules/sinon-1.16.1.js */
 Services.scriptloader.loadSubScript("resource://testing-common/sinon-1.16.1.js");
 
 const TEST_QUOTA_USAGE_HOST = "example.com";
 const TEST_QUOTA_USAGE_ORIGIN = "https://" + TEST_QUOTA_USAGE_HOST;
-const TEST_QUOTA_USAGE_URL = TEST_QUOTA_USAGE_ORIGIN + "/browser/browser/components/preferences/in-content/tests/site_data_test.html";
+const TEST_QUOTA_USAGE_URL = TEST_QUOTA_USAGE_ORIGIN + "/browser/browser/components/preferences/in-content-new/tests/site_data_test.html";
 const TEST_OFFLINE_HOST = "example.org";
 const TEST_OFFLINE_ORIGIN = "https://" + TEST_OFFLINE_HOST;
-const TEST_OFFLINE_URL = TEST_OFFLINE_ORIGIN + "/browser/browser/components/preferences/in-content/tests/offline/offline.html";
+const TEST_OFFLINE_URL = TEST_OFFLINE_ORIGIN + "/browser/browser/components/preferences/in-content-new/tests/offline/offline.html";
 const REMOVE_DIALOG_URL = "chrome://browser/content/preferences/siteDataRemoveSelected.xul";
 
 const { NetUtil } = Cu.import("resource://gre/modules/NetUtil.jsm", {});
 const { DownloadUtils } = Cu.import("resource://gre/modules/DownloadUtils.jsm", {});
 const { SiteDataManager } = Cu.import("resource:///modules/SiteDataManager.jsm", {});
 const { OfflineAppCacheHelper } = Cu.import("resource:///modules/offlineAppCache.jsm", {});
 
 const mockOfflineAppCacheHelper = {

rename from browser/components/preferences/in-content/tests/browser_siteData2.js
rename to browser/components/preferences/in-content-new/tests/browser_siteData2.js

rename from browser/components/preferences/in-content/tests/browser_subdialogs.js
rename to browser/components/preferences/in-content-new/tests/browser_subdialogs.js

rename from browser/components/preferences/in-content/tests/browser_telemetry.js
rename to browser/components/preferences/in-content-new/tests/browser_telemetry.js

rename from browser/components/preferences/in-content/tests/head.js
rename to browser/components/preferences/in-content-new/tests/head.js

rename from browser/components/preferences/in-content/tests/offline/manifest.appcache
rename to browser/components/preferences/in-content-new/tests/offline/manifest.appcache

rename from browser/components/preferences/in-content/tests/offline/offline.html
rename to browser/components/preferences/in-content-new/tests/offline/offline.html

rename from browser/components/preferences/in-content/tests/privacypane_tests_perwindow.js
rename to browser/components/preferences/in-content-new/tests/privacypane_tests_perwindow.js

rename from browser/components/preferences/in-content/tests/site_data_test.html
rename to browser/components/preferences/in-content-new/tests/site_data_test.html

rename from browser/components/preferences/in-content/tests/subdialog.xul
rename to browser/components/preferences/in-content-new/tests/subdialog.xul

rename from browser/components/preferences/in-content/tests/subdialog2.xul
rename to browser/components/preferences/in-content-new/tests/subdialog2.xul

--- a/browser/components/preferences/moz.build
+++ b/browser/components/preferences/moz.build
@@ -1,22 +1,22 @@
 # -*- Mode: python; 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 += [
-	'in-content-old',
-	'in-content'
+	'in-content-new',
+	'in-content-old'
 ]
 
 BROWSER_CHROME_MANIFESTS += [
-    'in-content-old/tests/browser.ini',
-    'in-content/tests/browser.ini'
+    'in-content-new/tests/browser.ini',
+    'in-content-old/tests/browser.ini'
 ]
 
 for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):
     DEFINES[var] = CONFIG[var]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):
     DEFINES['HAVE_SHELL_SERVICE'] = 1
 

--- a/browser/components/preferences/siteDataRemoveSelected.xul
+++ b/browser/components/preferences/siteDataRemoveSelected.xul
@@ -1,17 +1,17 @@
 <?xml version="1.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/. -->
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/content/preferences/siteDataSettings.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/siteDataSettings.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/preferences/in-content-new/siteDataSettings.css" type="text/css"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://browser/locale/preferences/siteDataSettings.dtd" >
 
 <dialog id="SiteDataRemoveSelectedDialog"
         windowtype="Browser:SiteDataRemoveSelected"
         width="500"
         title="&removingDialog.title;"
         onload="gSiteDataRemoveSelected.init();"

--- a/browser/components/preferences/siteDataSettings.xul
+++ b/browser/components/preferences/siteDataSettings.xul
@@ -2,17 +2,17 @@
 
 <!-- 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/. -->
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/content/preferences/siteDataSettings.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/siteDataSettings.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/preferences/in-content-new/siteDataSettings.css" type="text/css"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://browser/locale/preferences/siteDataSettings.dtd" >
 
 <window id="SiteDataSettingsDialog" windowtype="Browser:SiteDataSettings"
         class="windowDialog" title="&window.title;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         style="width: 45em;"
         onload="gSiteDataSettings.init();"

--- a/browser/extensions/formautofill/content/editProfile.xhtml
+++ b/browser/extensions/formautofill/content/editProfile.xhtml
@@ -4,17 +4,17 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <title>Profile Autofill - Edit Profile</title>
   <!-- common.css and dialog.css need to be included until this file can be
      - loaded as a stacked subdialog. -->
   <link rel="stylesheet" href="chrome://global/skin/in-content/common.css" />
-  <link rel="stylesheet" href="chrome://browser/skin/preferences/in-content/dialog.css" />
+  <link rel="stylesheet" href="chrome://browser/skin/preferences/in-content-new/dialog.css" />
   <link rel="stylesheet" href="chrome://formautofill-shared/skin/editProfile.css" />
   <link rel="stylesheet" href="chrome://formautofill/skin/editProfile.css" />
   <script src="chrome://formautofill/content/editProfile.js"></script>
 </head>
 <body>
   <form>
     <label id="given-name-container">
       <span>First Name</span>

--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@@ -16,26 +16,26 @@ browser/chrome/browser/content/browser/p
 browser/chrome/browser/content/browser/preferences/in-content-old/containers.js
 browser/chrome/browser/content/browser/preferences/in-content-old/content.js
 browser/chrome/browser/content/browser/preferences/in-content-old/main.js
 browser/chrome/browser/content/browser/preferences/in-content-old/preferences.js
 browser/chrome/browser/content/browser/preferences/in-content-old/privacy.js
 browser/chrome/browser/content/browser/preferences/in-content-old/search.js
 browser/chrome/browser/content/browser/preferences/in-content-old/security.js
 browser/chrome/browser/content/browser/preferences/in-content-old/sync.js
-browser/chrome/browser/content/browser/preferences/in-content/advanced.js
-browser/chrome/browser/content/browser/preferences/in-content/applications.js
-browser/chrome/browser/content/browser/preferences/in-content/containers.js
-browser/chrome/browser/content/browser/preferences/in-content/content.js
-browser/chrome/browser/content/browser/preferences/in-content/main.js
-browser/chrome/browser/content/browser/preferences/in-content/preferences.js
-browser/chrome/browser/content/browser/preferences/in-content/privacy.js
-browser/chrome/browser/content/browser/preferences/in-content/search.js
-browser/chrome/browser/content/browser/preferences/in-content/security.js
-browser/chrome/browser/content/browser/preferences/in-content/sync.js
+browser/chrome/browser/content/browser/preferences/in-content-new/advanced.js
+browser/chrome/browser/content/browser/preferences/in-content-new/applications.js
+browser/chrome/browser/content/browser/preferences/in-content-new/containers.js
+browser/chrome/browser/content/browser/preferences/in-content-new/content.js
+browser/chrome/browser/content/browser/preferences/in-content-new/main.js
+browser/chrome/browser/content/browser/preferences/in-content-new/preferences.js
+browser/chrome/browser/content/browser/preferences/in-content-new/privacy.js
+browser/chrome/browser/content/browser/preferences/in-content-new/search.js
+browser/chrome/browser/content/browser/preferences/in-content-new/security.js
+browser/chrome/browser/content/browser/preferences/in-content-new/sync.js
 browser/chrome/en-US/locale/browser/preferences-old/applications.dtd
 browser/chrome/en-US/locale/browser/preferences-old/containers.properties
 browser/chrome/en-US/locale/browser/preferences-old/containers.dtd
 browser/chrome/en-US/locale/browser/preferences-old/tabs.dtd
 browser/chrome/en-US/locale/browser/preferences-old/preferences.dtd
 browser/chrome/en-US/locale/browser/preferences-old/search.dtd
 browser/chrome/en-US/locale/browser/preferences-old/security.dtd
 browser/chrome/en-US/locale/browser/preferences-old/main.dtd
@@ -58,22 +58,22 @@ browser/chrome/en-US/locale/browser/pref
 browser/chrome/en-US/locale/browser/preferences/advanced.dtd
 browser/chrome/en-US/locale/browser/preferences/preferences.properties
 browser/chrome/browser/skin/classic/browser/preferences/in-content-old/search.css
 browser/chrome/browser/skin/classic/browser/preferences/in-content-old/containers.css
 browser/chrome/browser/skin/classic/browser/preferences/in-content-old/favicon.ico
 browser/chrome/browser/skin/classic/browser/preferences/in-content-old/icons.svg
 browser/chrome/browser/skin/classic/browser/preferences/in-content-old/preferences.css
 browser/chrome/browser/skin/classic/browser/preferences/in-content-old/dialog.css
-browser/chrome/browser/skin/classic/browser/preferences/in-content/search.css
-browser/chrome/browser/skin/classic/browser/preferences/in-content/containers.css
-browser/chrome/browser/skin/classic/browser/preferences/in-content/favicon.ico
-browser/chrome/browser/skin/classic/browser/preferences/in-content/icons.svg
-browser/chrome/browser/skin/classic/browser/preferences/in-content/preferences.css
-browser/chrome/browser/skin/classic/browser/preferences/in-content/dialog.css
+browser/chrome/browser/skin/classic/browser/preferences/in-content-new/search.css
+browser/chrome/browser/skin/classic/browser/preferences/in-content-new/containers.css
+browser/chrome/browser/skin/classic/browser/preferences/in-content-new/favicon.ico
+browser/chrome/browser/skin/classic/browser/preferences/in-content-new/icons.svg
+browser/chrome/browser/skin/classic/browser/preferences/in-content-new/preferences.css
+browser/chrome/browser/skin/classic/browser/preferences/in-content-new/dialog.css
 # browser branding / themes is bug 1313106
 browser/chrome/browser/content/branding/icon128.png
 browser/chrome/browser/content/branding/icon16.png
 browser/chrome/browser/content/branding/icon32.png
 browser/chrome/browser/content/branding/icon48.png
 browser/chrome/browser/content/browser/defaultthemes/5.header.png
 browser/chrome/browser/content/browser/extension.svg
 browser/chrome/browser/content/browser/places/bookmarkProperties.xul

--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -61,19 +61,19 @@ browser.jar:
   skin/classic/browser/places/query.png               (places/query.png)
   skin/classic/browser/places/tag.png                 (places/tag.png)
   skin/classic/browser/places/toolbarDropMarker.png   (places/toolbarDropMarker.png)
   skin/classic/browser/places/unsortedBookmarks.png   (places/unsortedBookmarks.png)
   skin/classic/browser/places/downloads.png           (places/downloads.png)
   skin/classic/browser/preferences/alwaysAsk.png      (preferences/alwaysAsk.png)
   skin/classic/browser/preferences/preferences.css    (preferences/preferences.css)
 * skin/classic/browser/preferences/in-content-old/preferences.css (preferences/in-content-old/preferences.css)
-* skin/classic/browser/preferences/in-content/preferences.css     (preferences/in-content/preferences.css)
+* skin/classic/browser/preferences/in-content-new/preferences.css     (preferences/in-content-new/preferences.css)
 * skin/classic/browser/preferences/in-content-old/dialog.css      (preferences/in-content-old/dialog.css)
-* skin/classic/browser/preferences/in-content/dialog.css          (preferences/in-content/dialog.css)
+* skin/classic/browser/preferences/in-content-new/dialog.css          (preferences/in-content-new/dialog.css)
   skin/classic/browser/preferences/applications.css   (preferences/applications.css)
   skin/classic/browser/social/services-16.png         (social/services-16.png)
   skin/classic/browser/social/services-64.png         (social/services-64.png)
   skin/classic/browser/tabbrowser/alltabs.png         (tabbrowser/alltabs.png)
   skin/classic/browser/tabbrowser/alltabs-inverted.png (tabbrowser/alltabs-inverted.png)
   skin/classic/browser/tabbrowser/newtab.svg                (tabbrowser/newtab.svg)
   skin/classic/browser/tabbrowser/newtab-inverted.svg       (tabbrowser/newtab-inverted.svg)
   skin/classic/browser/tabbrowser/tab-active-middle.png     (tabbrowser/tab-active-middle.png)

rename from browser/themes/linux/preferences/in-content/dialog.css
rename to browser/themes/linux/preferences/in-content-new/dialog.css

rename from browser/themes/linux/preferences/in-content/preferences.css
rename to browser/themes/linux/preferences/in-content-new/preferences.css

--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -94,19 +94,19 @@ browser.jar:
   skin/classic/browser/places/tag@2x.png                    (places/tag@2x.png)
   skin/classic/browser/places/downloads.png                 (places/downloads.png)
   skin/classic/browser/places/livemark-item.png             (places/livemark-item.png)
   skin/classic/browser/preferences/alwaysAsk.png            (preferences/alwaysAsk.png)
   skin/classic/browser/preferences/application.png          (preferences/application.png)
   skin/classic/browser/preferences/saveFile.png             (preferences/saveFile.png)
 * skin/classic/browser/preferences/preferences.css          (preferences/preferences.css)
 * skin/classic/browser/preferences/in-content-old/preferences.css (preferences/in-content-old/preferences.css)
-* skin/classic/browser/preferences/in-content/preferences.css     (preferences/in-content/preferences.css)
+* skin/classic/browser/preferences/in-content-new/preferences.css     (preferences/in-content-new/preferences.css)
 * skin/classic/browser/preferences/in-content-old/dialog.css      (preferences/in-content-old/dialog.css)
-* skin/classic/browser/preferences/in-content/dialog.css          (preferences/in-content/dialog.css)
+* skin/classic/browser/preferences/in-content-new/dialog.css          (preferences/in-content-new/dialog.css)
   skin/classic/browser/preferences/applications.css         (preferences/applications.css)
   skin/classic/browser/social/services-16.png               (social/services-16.png)
   skin/classic/browser/social/services-16@2x.png            (social/services-16@2x.png)
   skin/classic/browser/social/services-64.png               (social/services-64.png)
   skin/classic/browser/social/services-64@2x.png            (social/services-64@2x.png)
   skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon.png             (tabbrowser/alltabs-box-bkgnd-icon.png)
   skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon@2x.png          (tabbrowser/alltabs-box-bkgnd-icon@2x.png)
   skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon-inverted.png    (tabbrowser/alltabs-box-bkgnd-icon-inverted.png)

rename from browser/themes/osx/preferences/in-content/dialog.css
rename to browser/themes/osx/preferences/in-content-new/dialog.css

rename from browser/themes/osx/preferences/in-content/preferences.css
rename to browser/themes/osx/preferences/in-content-new/preferences.css

--- a/browser/themes/shared/incontentprefs/preferences.inc.css
+++ b/browser/themes/shared/incontentprefs/preferences.inc.css
@@ -69,37 +69,37 @@ treecol {
  * preferences.js, so use collapse instead of display: none; if it's hidden
  */
 #categories > .category[hidden="true"] {
   display: -moz-box;
   visibility: collapse;
 }
 
 #category-general > .category-icon {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#general");
+  list-style-image: url("chrome://browser/skin/preferences/in-content-new/icons.svg#general");
 }
 
 #category-application > .category-icon {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#content");
+  list-style-image: url("chrome://browser/skin/preferences/in-content-new/icons.svg#content");
 }
 
 #category-privacy > .category-icon {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#security");
+  list-style-image: url("chrome://browser/skin/preferences/in-content-new/icons.svg#security");
 }
 
 #category-sync > .category-icon {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#sync");
+  list-style-image: url("chrome://browser/skin/preferences/in-content-new/icons.svg#sync");
 }
 
 #category-advanced > .category-icon {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#advanced");
+  list-style-image: url("chrome://browser/skin/preferences/in-content-new/icons.svg#advanced");
 }
 
 #category-search-results > .category-icon {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#searchResults");
+  list-style-image: url("chrome://browser/skin/preferences/in-content-new/icons.svg#searchResults");
 }
 
 @media (max-width: 800px) {
   .category-name {
     display: none;
   }
   .help-button {
     font-size: 0 !important;

--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -69,21 +69,21 @@
   skin/classic/browser/info.svg                                (../shared/info.svg)
 * skin/classic/browser/menuPanel.svg                           (../shared/menuPanel.svg)
 * skin/classic/browser/menuPanel-small.svg                     (../shared/menuPanel-small.svg)
 * skin/classic/browser/notification-icons.svg                  (../shared/notification-icons.svg)
   skin/classic/browser/tracking-protection-16.svg              (../shared/identity-block/tracking-protection-16.svg)
   skin/classic/browser/newtab/close.png                        (../shared/newtab/close.png)
   skin/classic/browser/newtab/controls.svg                     (../shared/newtab/controls.svg)
   skin/classic/browser/panel-icons.svg                         (../shared/panel-icons.svg)
-  skin/classic/browser/preferences/in-content/favicon.ico      (../shared/incontentprefs/favicon.ico)
-  skin/classic/browser/preferences/in-content/icons.svg        (../shared/incontentprefs/icons.svg)
-  skin/classic/browser/preferences/in-content/search.css       (../shared/incontentprefs/search.css)
-  skin/classic/browser/preferences/in-content/siteDataSettings.css (../shared/incontentprefs/siteDataSettings.css)
-* skin/classic/browser/preferences/in-content/containers.css   (../shared/incontentprefs/containers.css)
+  skin/classic/browser/preferences/in-content-new/favicon.ico      (../shared/incontentprefs/favicon.ico)
+  skin/classic/browser/preferences/in-content-new/icons.svg        (../shared/incontentprefs/icons.svg)
+  skin/classic/browser/preferences/in-content-new/search.css       (../shared/incontentprefs/search.css)
+  skin/classic/browser/preferences/in-content-new/siteDataSettings.css (../shared/incontentprefs/siteDataSettings.css)
+* skin/classic/browser/preferences/in-content-new/containers.css   (../shared/incontentprefs/containers.css)
   skin/classic/browser/preferences/in-content-old/favicon.ico      (../shared/incontentprefs-old/favicon.ico)
   skin/classic/browser/preferences/in-content-old/icons.svg        (../shared/incontentprefs-old/icons.svg)
   skin/classic/browser/preferences/in-content-old/search.css       (../shared/incontentprefs-old/search.css)
 * skin/classic/browser/preferences/in-content-old/containers.css   (../shared/incontentprefs-old/containers.css)
 * skin/classic/browser/preferences/containers.css              (../shared/preferences/containers.css)
   skin/classic/browser/fxa/default-avatar.svg                  (../shared/fxa/default-avatar.svg)
   skin/classic/browser/fxa/logo.png                            (../shared/fxa/logo.png)
   skin/classic/browser/fxa/logo@2x.png                         (../shared/fxa/logo@2x.png)

--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -88,19 +88,19 @@ browser.jar:
   skin/classic/browser/places/unsortedBookmarks.png            (places/unsortedBookmarks.png)
   skin/classic/browser/places/downloads.png                    (places/downloads.png)
   skin/classic/browser/places/livemark-item.png                (places/livemark-item.png)
   skin/classic/browser/preferences/alwaysAsk.png               (preferences/alwaysAsk.png)
   skin/classic/browser/preferences/application.png             (preferences/application.png)
   skin/classic/browser/preferences/saveFile.png                (preferences/saveFile.png)
   skin/classic/browser/preferences/preferences.css             (preferences/preferences.css)
 * skin/classic/browser/preferences/in-content-old/preferences.css  (preferences/in-content-old/preferences.css)
-* skin/classic/browser/preferences/in-content/preferences.css      (preferences/in-content/preferences.css)
+* skin/classic/browser/preferences/in-content-new/preferences.css      (preferences/in-content-new/preferences.css)
 * skin/classic/browser/preferences/in-content-old/dialog.css       (preferences/in-content-old/dialog.css)
-* skin/classic/browser/preferences/in-content/dialog.css           (preferences/in-content/dialog.css)
+* skin/classic/browser/preferences/in-content-new/dialog.css           (preferences/in-content-new/dialog.css)
   skin/classic/browser/preferences/applications.css            (preferences/applications.css)
   skin/classic/browser/social/services-16.png                  (social/services-16.png)
   skin/classic/browser/social/services-64.png                  (social/services-64.png)
   skin/classic/browser/tabbrowser/newtab.svg                   (tabbrowser/newtab.svg)
   skin/classic/browser/tabbrowser/newtab-win7.svg          (tabbrowser/newtab-win7.svg)
   skin/classic/browser/tabbrowser/newtab-inverted.svg          (tabbrowser/newtab-inverted.svg)
   skin/classic/browser/tabbrowser/newtab-inverted-win7.svg (tabbrowser/newtab-inverted-win7.svg)
   skin/classic/browser/tabbrowser/tab-active-middle.png        (tabbrowser/tab-active-middle.png)

rename from browser/themes/windows/preferences/in-content/dialog.css
rename to browser/themes/windows/preferences/in-content-new/dialog.css

rename from browser/themes/windows/preferences/in-content/preferences.css
rename to browser/themes/windows/preferences/in-content-new/preferences.css
--- a/browser/themes/windows/preferences/in-content/preferences.css
+++ b/browser/themes/windows/preferences/in-content-new/preferences.css
@@ -1,37 +1,37 @@
 /* - 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 ../../../shared/incontentprefs/preferences.inc.css
 
 @media (-moz-windows-default-theme: 0) {
   #category-general > .category-icon {
-    list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#general-native");
+    list-style-image: url("chrome://browser/skin/preferences/in-content-new/icons.svg#general-native");
   }
 
   #category-application > .category-icon {
-    list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#applications-native");
+    list-style-image: url("chrome://browser/skin/preferences/in-content-new/icons.svg#applications-native");
   }
 
   #category-privacy > .category-icon {
-    list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#privacy-native");
+    list-style-image: url("chrome://browser/skin/preferences/in-content-new/icons.svg#privacy-native");
   }
 
   #category-sync > .category-icon {
-    list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#sync-native");
+    list-style-image: url("chrome://browser/skin/preferences/in-content-new/icons.svg#sync-native");
   }
 
   #category-advanced > .category-icon {
-    list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#advanced-native");
+    list-style-image: url("chrome://browser/skin/preferences/in-content-new/icons.svg#advanced-native");
   }
 
   #category-search-results > .category-icon {
-    list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#searchResults-native");
+    list-style-image: url("chrome://browser/skin/preferences/in-content-new/icons.svg#searchResults-native");
   }
 }
 
 .actionsMenu > .menulist-label-box > .menulist-icon {
   margin-inline-end: 9px;
 }
 
 textbox + button,

--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.jsm
@@ -4,17 +4,17 @@
 
 "use strict";
 
 this.EXPORTED_SYMBOLS = ["Tabs"];
 
 const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
 const CUST_TAB = "chrome://browser/skin/customizableui/customizeFavicon.ico";
-const PREFS_TAB = "chrome://browser/skin/preferences/in-content/favicon.ico";
+const PREFS_TAB = "chrome://browser/skin/preferences/in-content-new/favicon.ico";
 const DEFAULT_FAVICON_TAB = `data:text/html,<meta charset="utf-8">
 <title>No favicon</title>`;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Timer.jsm");
 
 this.Tabs = {
   init(libDir) {},

--- a/testing/runtimes/mochitest-browser-chrome-e10s.runtimes.json
+++ b/testing/runtimes/mochitest-browser-chrome-e10s.runtimes.json
@@ -430,36 +430,36 @@
     "browser/components/places/tests/browser/browser_bookmarklet_windowOpen.js": 2811, 
     "browser/components/places/tests/browser/browser_bookmarksProperties.js": 4908, 
     "browser/components/places/tests/browser/browser_forgetthissite_single.js": 2712, 
     "browser/components/places/tests/browser/browser_library_commands.js": 6259, 
     "browser/components/places/tests/browser/browser_library_middleclick.js": 4930, 
     "browser/components/places/tests/browser/browser_library_views_liveupdate.js": 9129, 
     "browser/components/places/tests/browser/browser_sort_in_library.js": 2771, 
     "browser/components/places/tests/browser/browser_views_liveupdate.js": 4735, 
-    "browser/components/preferences/in-content/tests/browser_advanced_siteData.js": 5809, 
-    "browser/components/preferences/in-content/tests/browser_advanced_update.js": 4994, 
-    "browser/components/preferences/in-content/tests/browser_basic_rebuild_fonts_test.js": 3402, 
-    "browser/components/preferences/in-content/tests/browser_bug1020245_openPreferences_to_paneContent.js": 8840, 
-    "browser/components/preferences/in-content/tests/browser_bug1184989_prevent_scrolling_when_preferences_flipped.js": 3776, 
-    "browser/components/preferences/in-content/tests/browser_bug731866.js": 4124, 
-    "browser/components/preferences/in-content/tests/browser_connection_bug388287.js": 5029, 
-    "browser/components/preferences/in-content/tests/browser_cookies_exceptions.js": 32201, 
-    "browser/components/preferences/in-content/tests/browser_defaultbrowser_alwayscheck.js": 3689, 
-    "browser/components/preferences/in-content/tests/browser_homepages_filter_aboutpreferences.js": 3358, 
-    "browser/components/preferences/in-content/tests/browser_permissions_urlFieldHidden.js": 4320, 
-    "browser/components/preferences/in-content/tests/browser_privacypane_1.js": 13262, 
-    "browser/components/preferences/in-content/tests/browser_privacypane_3.js": 12449, 
-    "browser/components/preferences/in-content/tests/browser_privacypane_4.js": 21002, 
-    "browser/components/preferences/in-content/tests/browser_privacypane_5.js": 12584, 
-    "browser/components/preferences/in-content/tests/browser_privacypane_8.js": 12359, 
-    "browser/components/preferences/in-content/tests/browser_sanitizeOnShutdown_prefLocked.js": 4144, 
-    "browser/components/preferences/in-content/tests/browser_searchsuggestions.js": 3473, 
-    "browser/components/preferences/in-content/tests/browser_security.js": 16398, 
-    "browser/components/preferences/in-content/tests/browser_subdialogs.js": 9718, 
+    "browser/components/preferences/in-content-new/tests/browser_advanced_siteData.js": 5809, 
+    "browser/components/preferences/in-content-new/tests/browser_advanced_update.js": 4994, 
+    "browser/components/preferences/in-content-new/tests/browser_basic_rebuild_fonts_test.js": 3402, 
+    "browser/components/preferences/in-content-new/tests/browser_bug1020245_openPreferences_to_paneContent.js": 8840, 
+    "browser/components/preferences/in-content-new/tests/browser_bug1184989_prevent_scrolling_when_preferences_flipped.js": 3776, 
+    "browser/components/preferences/in-content-new/tests/browser_bug731866.js": 4124, 
+    "browser/components/preferences/in-content-new/tests/browser_connection_bug388287.js": 5029, 
+    "browser/components/preferences/in-content-new/tests/browser_cookies_exceptions.js": 32201, 
+    "browser/components/preferences/in-content-new/tests/browser_defaultbrowser_alwayscheck.js": 3689, 
+    "browser/components/preferences/in-content-new/tests/browser_homepages_filter_aboutpreferences.js": 3358, 
+    "browser/components/preferences/in-content-new/tests/browser_permissions_urlFieldHidden.js": 4320, 
+    "browser/components/preferences/in-content-new/tests/browser_privacypane_1.js": 13262, 
+    "browser/components/preferences/in-content-new/tests/browser_privacypane_3.js": 12449, 
+    "browser/components/preferences/in-content-new/tests/browser_privacypane_4.js": 21002, 
+    "browser/components/preferences/in-content-new/tests/browser_privacypane_5.js": 12584, 
+    "browser/components/preferences/in-content-new/tests/browser_privacypane_8.js": 12359, 
+    "browser/components/preferences/in-content-new/tests/browser_sanitizeOnShutdown_prefLocked.js": 4144, 
+    "browser/components/preferences/in-content-new/tests/browser_searchsuggestions.js": 3473, 
+    "browser/components/preferences/in-content-new/tests/browser_security.js": 16398, 
+    "browser/components/preferences/in-content-new/tests/browser_subdialogs.js": 9718, 
     "browser/components/privatebrowsing/test/browser/browser_privatebrowsing_DownloadLastDirWithCPS.js": 6766, 
     "browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about.js": 5869, 
     "browser/components/privatebrowsing/test/browser/browser_privatebrowsing_aboutHomeButtonAfterWindowClose.js": 4184, 
     "browser/components/privatebrowsing/test/browser/browser_privatebrowsing_aboutSessionRestore.js": 4488, 
     "browser/components/privatebrowsing/test/browser/browser_privatebrowsing_blobUrl.js": 4308, 
     "browser/components/privatebrowsing/test/browser/browser_privatebrowsing_cache.js": 3564, 
     "browser/components/privatebrowsing/test/browser/browser_privatebrowsing_certexceptionsui.js": 2834, 
     "browser/components/privatebrowsing/test/browser/browser_privatebrowsing_concurrent.js": 8634, 
@@ -850,9 +850,9 @@
     "toolkit/mozapps/extensions/test/xpinstall/browser_bug638292.js": 3676, 
     "toolkit/mozapps/extensions/test/xpinstall/browser_concurrent_installs.js": 3441, 
     "toolkit/mozapps/extensions/test/xpinstall/browser_localfile.js": 3563, 
     "toolkit/mozapps/extensions/test/xpinstall/browser_localfile3.js": 2933, 
     "toolkit/mozapps/extensions/test/xpinstall/browser_localfile4.js": 3829, 
     "toolkit/mozapps/extensions/test/xpinstall/browser_signed_multiple.js": 2684, 
     "uriloader/exthandler/tests/mochitest/browser_web_protocol_handlers.js": 4533
   }
-}
\ No newline at end of file
+}

--- a/testing/runtimes/mochitest-browser-chrome.runtimes.json
+++ b/testing/runtimes/mochitest-browser-chrome.runtimes.json
@@ -400,38 +400,38 @@
     "browser/components/places/tests/browser/browser_forgetthissite_single.js": 2492, 
     "browser/components/places/tests/browser/browser_library_batch_delete.js": 2138, 
     "browser/components/places/tests/browser/browser_library_commands.js": 5823, 
     "browser/components/places/tests/browser/browser_library_infoBox.js": 2070, 
     "browser/components/places/tests/browser/browser_library_middleclick.js": 4660, 
     "browser/components/places/tests/browser/browser_library_views_liveupdate.js": 9015, 
     "browser/components/places/tests/browser/browser_sort_in_library.js": 2706, 
     "browser/components/places/tests/browser/browser_views_liveupdate.js": 4275, 
-    "browser/components/preferences/in-content/tests/browser_advanced_siteData.js": 4546, 
-    "browser/components/preferences/in-content/tests/browser_advanced_update.js": 3765, 
-    "browser/components/preferences/in-content/tests/browser_basic_rebuild_fonts_test.js": 2815, 
-    "browser/components/preferences/in-content/tests/browser_bug1020245_openPreferences_to_paneContent.js": 7119, 
-    "browser/components/preferences/in-content/tests/browser_bug1184989_prevent_scrolling_when_preferences_flipped.js": 3072, 
-    "browser/components/preferences/in-content/tests/browser_bug731866.js": 3887, 
-    "browser/components/preferences/in-content/tests/browser_connection.js": 2059, 
-    "browser/components/preferences/in-content/tests/browser_connection_bug388287.js": 4792, 
-    "browser/components/preferences/in-content/tests/browser_cookies_exceptions.js": 24898, 
-    "browser/components/preferences/in-content/tests/browser_defaultbrowser_alwayscheck.js": 3312, 
-    "browser/components/preferences/in-content/tests/browser_homepages_filter_aboutpreferences.js": 2566, 
-    "browser/components/preferences/in-content/tests/browser_permissions_urlFieldHidden.js": 3240, 
-    "browser/components/preferences/in-content/tests/browser_privacypane_1.js": 12582, 
-    "browser/components/preferences/in-content/tests/browser_privacypane_3.js": 11813, 
-    "browser/components/preferences/in-content/tests/browser_privacypane_4.js": 19735, 
-    "browser/components/preferences/in-content/tests/browser_privacypane_5.js": 11639, 
-    "browser/components/preferences/in-content/tests/browser_privacypane_8.js": 11650, 
-    "browser/components/preferences/in-content/tests/browser_proxy_backup.js": 2184, 
-    "browser/components/preferences/in-content/tests/browser_sanitizeOnShutdown_prefLocked.js": 3107, 
-    "browser/components/preferences/in-content/tests/browser_searchsuggestions.js": 2438, 
-    "browser/components/preferences/in-content/tests/browser_security.js": 11804, 
-    "browser/components/preferences/in-content/tests/browser_subdialogs.js": 8790, 
+    "browser/components/preferences/in-content-new/tests/browser_advanced_siteData.js": 4546, 
+    "browser/components/preferences/in-content-new/tests/browser_advanced_update.js": 3765, 
+    "browser/components/preferences/in-content-new/tests/browser_basic_rebuild_fonts_test.js": 2815, 
+    "browser/components/preferences/in-content-new/tests/browser_bug1020245_openPreferences_to_paneContent.js": 7119, 
+    "browser/components/preferences/in-content-new/tests/browser_bug1184989_prevent_scrolling_when_preferences_flipped.js": 3072, 
+    "browser/components/preferences/in-content-new/tests/browser_bug731866.js": 3887, 
+    "browser/components/preferences/in-content-new/tests/browser_connection.js": 2059, 
+    "browser/components/preferences/in-content-new/tests/browser_connection_bug388287.js": 4792, 
+    "browser/components/preferences/in-content-new/tests/browser_cookies_exceptions.js": 24898, 
+    "browser/components/preferences/in-content-new/tests/browser_defaultbrowser_alwayscheck.js": 3312, 
+    "browser/components/preferences/in-content-new/tests/browser_homepages_filter_aboutpreferences.js": 2566, 
+    "browser/components/preferences/in-content-new/tests/browser_permissions_urlFieldHidden.js": 3240, 
+    "browser/components/preferences/in-content-new/tests/browser_privacypane_1.js": 12582, 
+    "browser/components/preferences/in-content-new/tests/browser_privacypane_3.js": 11813, 
+    "browser/components/preferences/in-content-new/tests/browser_privacypane_4.js": 19735, 
+    "browser/components/preferences/in-content-new/tests/browser_privacypane_5.js": 11639, 
+    "browser/components/preferences/in-content-new/tests/browser_privacypane_8.js": 11650, 
+    "browser/components/preferences/in-content-new/tests/browser_proxy_backup.js": 2184, 
+    "browser/components/preferences/in-content-new/tests/browser_sanitizeOnShutdown_prefLocked.js": 3107, 
+    "browser/components/preferences/in-content-new/tests/browser_searchsuggestions.js": 2438, 
+    "browser/components/preferences/in-content-new/tests/browser_security.js": 11804, 
+    "browser/components/preferences/in-content-new/tests/browser_subdialogs.js": 8790, 
     "browser/components/privatebrowsing/test/browser/browser_privatebrowsing_DownloadLastDirWithCPS.js": 6301, 
     "browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about.js": 4713, 
     "browser/components/privatebrowsing/test/browser/browser_privatebrowsing_aboutHomeButtonAfterWindowClose.js": 3379, 
     "browser/components/privatebrowsing/test/browser/browser_privatebrowsing_aboutSessionRestore.js": 3345, 
     "browser/components/privatebrowsing/test/browser/browser_privatebrowsing_blobUrl.js": 3606, 
     "browser/components/privatebrowsing/test/browser/browser_privatebrowsing_cache.js": 2957, 
     "browser/components/privatebrowsing/test/browser/browser_privatebrowsing_certexceptionsui.js": 2477, 
     "browser/components/privatebrowsing/test/browser/browser_privatebrowsing_concurrent.js": 7935, 
@@ -849,9 +849,9 @@
     "toolkit/mozapps/extensions/test/xpinstall/browser_auth4.js": 2193, 
     "toolkit/mozapps/extensions/test/xpinstall/browser_bug638292.js": 2663, 
     "toolkit/mozapps/extensions/test/xpinstall/browser_concurrent_installs.js": 2840, 
     "toolkit/mozapps/extensions/test/xpinstall/browser_httphash5.js": 1977, 
     "toolkit/mozapps/extensions/test/xpinstall/browser_httphash6.js": 2262, 
     "toolkit/mozapps/extensions/test/xpinstall/browser_signed_multiple.js": 2368, 
     "uriloader/exthandler/tests/mochitest/browser_web_protocol_handlers.js": 4136
   }
-}
\ No newline at end of file
+}