Bug 1619824 - Remove prefs disabling the OS X address book in tests. r=mkmelin
authorGeoff Lankow <geoff@darktrojan.net>
Mon, 02 Mar 2020 16:13:58 +1300
changeset 37471 94362ea102baae7c78f1314aa1270823d257a244
parent 37470 6a5938a9d3700b361629cffa6124520dfbb116ba
child 37472 209bac3c89042d885ac9a704665cbf3b07c03a40
push id2566
push userclokep@gmail.com
push dateMon, 09 Mar 2020 19:20:31 +0000
treeherdercomm-beta@a352facfa0a4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmkmelin
bugs1619824
Bug 1619824 - Remove prefs disabling the OS X address book in tests. r=mkmelin
calendar/test/browser/browser.ini
calendar/test/browser/eventDialog/browser.ini
calendar/test/browser/invitations/browser.ini
calendar/test/browser/preferences/browser.ini
calendar/test/browser/recurrence/browser.ini
calendar/test/browser/recurrenceRotated/browser.ini
calendar/test/browser/views/browser.ini
mail/base/test/browser/browser.ini
mail/components/addrbook/test/browser/browser.ini
mail/components/cloudfile/test/browser/browser.ini
mail/components/enterprisepolicies/tests/browser/browser.ini
mail/components/enterprisepolicies/tests/browser/disable_app_update/browser.ini
mail/components/enterprisepolicies/tests/browser/disable_developer_tools/browser.ini
mail/components/extensions/test/browser/browser.ini
mail/components/extensions/test/xpcshell/xpcshell.ini
mail/components/preferences/test/browser/browser.ini
mail/test/browser/account/browser.ini
mail/test/browser/addrbook/browser.ini
mail/test/browser/attachment/browser.ini
mail/test/browser/cloudfile/browser.ini
mail/test/browser/composition/browser.ini
mail/test/browser/content-policy/browser.ini
mail/test/browser/content-tabs/browser.ini
mail/test/browser/cookies/browser.ini
mail/test/browser/downloads/browser.ini
mail/test/browser/folder-display/browser.ini
mail/test/browser/folder-pane/browser.ini
mail/test/browser/folder-tree-modes/browser.ini
mail/test/browser/folder-widget/browser.ini
mail/test/browser/im/browser.ini
mail/test/browser/instrumentation/browser.ini
mail/test/browser/junk-commands/browser.ini
mail/test/browser/keyboard/browser.ini
mail/test/browser/message-header/browser.ini
mail/test/browser/message-reader/browser.ini
mail/test/browser/message-window/browser.ini
mail/test/browser/multiple-identities/browser.ini
mail/test/browser/newmailaccount/browser.ini
mail/test/browser/notification/browser.ini
mail/test/browser/override-main-menu-collapse/browser.ini
mail/test/browser/pref-window/browser.ini
mail/test/browser/quick-filter-bar/browser.ini
mail/test/browser/search-window/browser.ini
mail/test/browser/session-store/browser.ini
mail/test/browser/smime/browser.ini
mail/test/browser/startup-firstrun/browser.ini
mail/test/browser/subscribe/browser.ini
mail/test/browser/tabmail/browser.ini
mail/test/browser/utils/browser.ini
mail/test/static/browser.ini
mailnews/addrbook/test/unit/head_migration.js
mailnews/test/resources/abSetup.js
--- a/calendar/test/browser/browser.ini
+++ b/calendar/test/browser/browser.ini
@@ -1,15 +1,12 @@
 [default]
 head = head.js
 prefs =
   extensions.installDistroAddons=true
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 support-files = data/**
 
--- a/calendar/test/browser/eventDialog/browser.ini
+++ b/calendar/test/browser/eventDialog/browser.ini
@@ -1,15 +1,12 @@
 [default]
 head = head.js
 prefs =
   extensions.installDistroAddons=true
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 
 [browser_alarmDialog.js]
--- a/calendar/test/browser/invitations/browser.ini
+++ b/calendar/test/browser/invitations/browser.ini
@@ -1,16 +1,13 @@
 [default]
 head = ../head.js
 prefs =
   browser.tabs.remote.autostart=false # e10s
   extensions.installDistroAddons=true
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 
 [browser_imipBarEmail.js]
--- a/calendar/test/browser/preferences/browser.ini
+++ b/calendar/test/browser/preferences/browser.ini
@@ -1,15 +1,12 @@
 [default]
 head = ../head.js
 prefs =
   extensions.installDistroAddons=true
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 
 [browser_alarmDefaultValue.js]
--- a/calendar/test/browser/recurrence/browser.ini
+++ b/calendar/test/browser/recurrence/browser.ini
@@ -1,15 +1,12 @@
 [default]
 head = ../head.js
 prefs =
   extensions.installDistroAddons=true
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 
 [browser_annual.js]
--- a/calendar/test/browser/recurrenceRotated/browser.ini
+++ b/calendar/test/browser/recurrenceRotated/browser.ini
@@ -1,15 +1,12 @@
 [default]
 head = ../head.js
 prefs =
   extensions.installDistroAddons=true
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 
 [browser_annual.js]
--- a/calendar/test/browser/views/browser.ini
+++ b/calendar/test/browser/views/browser.ini
@@ -1,15 +1,12 @@
 [default]
 head = ../head.js
 prefs =
   extensions.installDistroAddons=true
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 
 [browser_dayView.js]
--- a/mail/base/test/browser/browser.ini
+++ b/mail/base/test/browser/browser.ini
@@ -1,13 +1,10 @@
 [DEFAULT]
 prefs =
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 
 [browser_menulist.js]
--- a/mail/components/addrbook/test/browser/browser.ini
+++ b/mail/components/addrbook/test/browser/browser.ini
@@ -1,14 +1,11 @@
 [DEFAULT]
 head = head.js
 prefs =
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 tags = addrbook
 
--- a/mail/components/cloudfile/test/browser/browser.ini
+++ b/mail/components/cloudfile/test/browser/browser.ini
@@ -1,14 +1,11 @@
 [DEFAULT]
 head = head.js
 prefs =
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 support-files = files/icon.svg files/management.html
 
--- a/mail/components/enterprisepolicies/tests/browser/browser.ini
+++ b/mail/components/enterprisepolicies/tests/browser/browser.ini
@@ -1,14 +1,11 @@
 [DEFAULT]
 head = head.js
 prefs =
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 support-files =
   policytest_v0.1.xpi
--- a/mail/components/enterprisepolicies/tests/browser/disable_app_update/browser.ini
+++ b/mail/components/enterprisepolicies/tests/browser/disable_app_update/browser.ini
@@ -1,13 +1,10 @@
 [DEFAULT]
 prefs =
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
   app.update.disabledForTesting=false
   browser.policies.alternatePath='<test-root>/comm/mail/components/enterprisepolicies/tests/browser/disable_app_update/config_disable_app_update.json'
 subsuite = thunderbird
--- a/mail/components/enterprisepolicies/tests/browser/disable_developer_tools/browser.ini
+++ b/mail/components/enterprisepolicies/tests/browser/disable_developer_tools/browser.ini
@@ -1,13 +1,10 @@
 [DEFAULT]
 prefs =
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
   browser.policies.alternatePath='<test-root>/comm/mail/components/enterprisepolicies/tests/browser/disable_developer_tools/config_disable_developer_tools.json'
 subsuite = thunderbird
 support-files =
--- a/mail/components/extensions/test/browser/browser.ini
+++ b/mail/components/extensions/test/browser/browser.ini
@@ -1,25 +1,23 @@
 [DEFAULT]
 head = head.js
 prefs =
-  browser.tabs.remote.autostart=false # e10s
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
+  browser.tabs.remote.autostart=false
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.database.global.indexer.enabled=false
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 tags = webextensions
 
 [browser_ext_addressBooksUI.js]
+tags = addrbook
 [browser_ext_browserAction.js]
 [browser_ext_browserAction_properties.js]
 [browser_ext_commands_execute_browser_action.js]
 [browser_ext_commands_getAll.js]
 [browser_ext_commands_onCommand.js]
 [browser_ext_commands_update.js]
 [browser_ext_compose_begin.js]
 [browser_ext_compose_details.js]
--- a/mail/components/extensions/test/xpcshell/xpcshell.ini
+++ b/mail/components/extensions/test/xpcshell/xpcshell.ini
@@ -1,14 +1,15 @@
 [default]
 head = head.js
 tags = webextensions
 
 [test_ext_accounts.js]
 [test_ext_addressBook.js]
+tags = addrbook
 [test_ext_alias.js]
 [test_ext_cloudFile.js]
 support-files = data/cloudFile1.txt data/cloudFile2.txt
 [test_ext_experiments.js]
 [test_ext_folders.js]
 [test_ext_messages.js]
 [test_ext_messages_get.js]
 [test_ext_messages_query.js]
--- a/mail/components/preferences/test/browser/browser.ini
+++ b/mail/components/preferences/test/browser/browser.ini
@@ -1,14 +1,11 @@
 [DEFAULT]
 head = head.js
 prefs =
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 
 [browser_chat.js]
--- a/mail/test/browser/account/browser.ini
+++ b/mail/test/browser/account/browser.ini
@@ -1,14 +1,11 @@
 [DEFAULT]
 prefs =
   browser.tabs.remote.autostart=false
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.account.account1.server=server1
   mail.account.account2.identities=id1,id2
   mail.account.account2.server=server2
   mail.accountmanager.accounts=account1,account2
   mail.accountmanager.defaultaccount=account2
   mail.accountmanager.localfoldersserver=server1
   mail.identity.id1.fullName=Tinderbox
   mail.identity.id1.htmlSigFormat=false
--- a/mail/test/browser/addrbook/browser.ini
+++ b/mail/test/browser/addrbook/browser.ini
@@ -1,13 +1,10 @@
 [DEFAULT]
 prefs =
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.database.global.indexer.enabled=false
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 tags = addrbook
--- a/mail/test/browser/attachment/browser.ini
+++ b/mail/test/browser/attachment/browser.ini
@@ -1,14 +1,11 @@
 [DEFAULT]
 prefs =
   browser.tabs.remote.autostart=false
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 support-files = data/**
 
--- a/mail/test/browser/cloudfile/browser.ini
+++ b/mail/test/browser/cloudfile/browser.ini
@@ -1,15 +1,12 @@
 [DEFAULT]
 head = head.js
 prefs =
   browser.tabs.remote.autostart=false
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.account.account1.server=server1
   mail.account.account2.identities=id1,id2
   mail.account.account2.server=server2
   mail.accountmanager.accounts=account1,account2
   mail.accountmanager.defaultaccount=account2
   mail.accountmanager.localfoldersserver=server1
   mail.identity.id1.fullName=Tinderbox
   mail.identity.id1.htmlSigFormat=false
--- a/mail/test/browser/composition/browser.ini
+++ b/mail/test/browser/composition/browser.ini
@@ -1,14 +1,11 @@
 [DEFAULT]
 prefs =
   browser.tabs.remote.autostart=false
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.account.account1.server=server1
   mail.account.account2.identities=id1,id2
   mail.account.account2.server=server2
   mail.accountmanager.accounts=account1,account2
   mail.accountmanager.defaultaccount=account2
   mail.accountmanager.localfoldersserver=server1
   mail.identity.id1.fullName=Tinderbox
   mail.identity.id1.htmlSigFormat=false
--- a/mail/test/browser/content-policy/browser.ini
+++ b/mail/test/browser/content-policy/browser.ini
@@ -1,14 +1,11 @@
 [DEFAULT]
 prefs =
   browser.tabs.remote.autostart=false
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 support-files = html/**
 
--- a/mail/test/browser/content-tabs/browser.ini
+++ b/mail/test/browser/content-tabs/browser.ini
@@ -1,15 +1,12 @@
 [DEFAULT]
 prefs =
   browser.tabs.remote.autostart=false
   extensions.blocklist.url=http://mochi.test:8888/browser/comm/mail/test/browser/content-tabs/html/dummy.xml
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.account.account1.server=server1
   mail.account.account2.identities=id1,id2
   mail.account.account2.server=server2
   mail.accountmanager.accounts=account1,account2
   mail.accountmanager.defaultaccount=account2
   mail.accountmanager.localfoldersserver=server1
   mail.identity.id1.fullName=Tinderbox
   mail.identity.id1.htmlSigFormat=false
--- a/mail/test/browser/cookies/browser.ini
+++ b/mail/test/browser/cookies/browser.ini
@@ -1,14 +1,11 @@
 [DEFAULT]
 prefs =
   browser.tabs.remote.autostart=false
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 support-files = html/**
 
--- a/mail/test/browser/downloads/browser.ini
+++ b/mail/test/browser/downloads/browser.ini
@@ -1,14 +1,11 @@
 [DEFAULT]
 prefs =
   browser.tabs.remote.autostart=false
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 
 [browser_aboutDownloads.js]
--- a/mail/test/browser/folder-display/browser.ini
+++ b/mail/test/browser/folder-display/browser.ini
@@ -1,14 +1,11 @@
 [DEFAULT]
 prefs =
   browser.tabs.remote.autostart=false
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.account.account1.server=server1
   mail.account.account2.identities=id1,id2
   mail.account.account2.server=server2
   mail.accountmanager.accounts=account1,account2
   mail.accountmanager.defaultaccount=account2
   mail.accountmanager.localfoldersserver=server1
   mail.identity.id1.fullName=Tinderbox
   mail.identity.id1.htmlSigFormat=false
--- a/mail/test/browser/folder-pane/browser.ini
+++ b/mail/test/browser/folder-pane/browser.ini
@@ -1,14 +1,11 @@
 [DEFAULT]
 prefs =
   browser.tabs.remote.autostart=false
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.account.account2.identities=id1,id2
   mail.account.account2.server=server2
   mail.accountmanager.accounts=account2
   mail.accountmanager.defaultaccount=account2
   mail.identity.id1.fullName=Tinderbox
   mail.identity.id1.htmlSigFormat=false
   mail.identity.id1.smtpServer=smtp1
   mail.identity.id1.useremail=tinderbox@foo.invalid
--- a/mail/test/browser/folder-tree-modes/browser.ini
+++ b/mail/test/browser/folder-tree-modes/browser.ini
@@ -1,14 +1,11 @@
 [DEFAULT]
 prefs =
   browser.tabs.remote.autostart=false
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.account.account1.server=server1
   mail.account.account2.identities=id1,id2
   mail.account.account2.server=server2
   mail.accountmanager.accounts=account1,account2
   mail.accountmanager.defaultaccount=account2
   mail.accountmanager.localfoldersserver=server1
   mail.identity.id1.fullName=Tinderbox
   mail.identity.id1.htmlSigFormat=false
--- a/mail/test/browser/folder-widget/browser.ini
+++ b/mail/test/browser/folder-widget/browser.ini
@@ -1,13 +1,10 @@
 [DEFAULT]
 prefs =
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.account.account1.server=server1
   mail.account.account2.identities=id1,id2
   mail.account.account2.server=server2
   mail.accountmanager.accounts=account1,account2
   mail.accountmanager.defaultaccount=account2
   mail.accountmanager.localfoldersserver=server1
   mail.identity.id1.fullName=Tinderbox
   mail.identity.id1.htmlSigFormat=false
--- a/mail/test/browser/im/browser.ini
+++ b/mail/test/browser/im/browser.ini
@@ -1,13 +1,10 @@
 [DEFAULT]
 prefs =
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.shell.checkDefaultClient=false
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
   messenger.account.account1.autoLogin=false
   messenger.account.account1.firstConnectionState=1
--- a/mail/test/browser/instrumentation/browser.ini
+++ b/mail/test/browser/instrumentation/browser.ini
@@ -1,13 +1,10 @@
 [DEFAULT]
 prefs =
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.enabled=false
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mail.wizard.logging.dump=All
   mailnews.auto_config.addons_url=about:blank
   mailnews.auto_config_url=about:blank
   mailnews.start_page.override_url=about:blank
--- a/mail/test/browser/junk-commands/browser.ini
+++ b/mail/test/browser/junk-commands/browser.ini
@@ -1,14 +1,11 @@
 [DEFAULT]
 prefs =
   browser.tabs.remote.autostart=false
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
   mailnews.ui.junk.firstuse=false
 subsuite = thunderbird
 
--- a/mail/test/browser/keyboard/browser.ini
+++ b/mail/test/browser/keyboard/browser.ini
@@ -1,14 +1,11 @@
 [DEFAULT]
 prefs =
   browser.tabs.remote.autostart=false
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 
 [browser_spacehit.js]
--- a/mail/test/browser/message-header/browser.ini
+++ b/mail/test/browser/message-header/browser.ini
@@ -1,14 +1,11 @@
 [DEFAULT]
 prefs =
   browser.tabs.remote.autostart=false
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 support-files = data/**
 
--- a/mail/test/browser/message-reader/browser.ini
+++ b/mail/test/browser/message-reader/browser.ini
@@ -1,14 +1,11 @@
 [DEFAULT]
 prefs =
   browser.tabs.remote.autostart=false
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 support-files = data/**
 
--- a/mail/test/browser/message-window/browser.ini
+++ b/mail/test/browser/message-window/browser.ini
@@ -1,14 +1,11 @@
 [DEFAULT]
 prefs =
   browser.tabs.remote.autostart=false
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 support-files = data/**
 
--- a/mail/test/browser/multiple-identities/browser.ini
+++ b/mail/test/browser/multiple-identities/browser.ini
@@ -1,14 +1,11 @@
 [DEFAULT]
 prefs =
   browser.tabs.remote.autostart=false
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 
 [browser_displayNames.js]
--- a/mail/test/browser/newmailaccount/browser.ini
+++ b/mail/test/browser/newmailaccount/browser.ini
@@ -1,14 +1,11 @@
 [DEFAULT]
 prefs =
   browser.tabs.remote.autostart=false
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.auto_config.addons_url=about:blank
   mailnews.auto_config_url=about:blank
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
--- a/mail/test/browser/notification/browser.ini
+++ b/mail/test/browser/notification/browser.ini
@@ -1,13 +1,10 @@
 [DEFAULT]
 prefs =
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 
 [browser_notification.js]
--- a/mail/test/browser/override-main-menu-collapse/browser.ini
+++ b/mail/test/browser/override-main-menu-collapse/browser.ini
@@ -1,13 +1,10 @@
 [DEFAULT]
 prefs =
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.main_menu.collapse_by_default=false
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 
--- a/mail/test/browser/pref-window/browser.ini
+++ b/mail/test/browser/pref-window/browser.ini
@@ -1,13 +1,10 @@
 [DEFAULT]
 prefs =
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 
 [browser_fontChooser.js]
--- a/mail/test/browser/quick-filter-bar/browser.ini
+++ b/mail/test/browser/quick-filter-bar/browser.ini
@@ -1,13 +1,10 @@
 [DEFAULT]
 prefs =
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 
 [browser_displayIssues.js]
--- a/mail/test/browser/search-window/browser.ini
+++ b/mail/test/browser/search-window/browser.ini
@@ -1,14 +1,11 @@
 [DEFAULT]
 prefs =
   browser.tabs.remote.autostart=false
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 
 [browser_multipleSearchWindows.js]
--- a/mail/test/browser/session-store/browser.ini
+++ b/mail/test/browser/session-store/browser.ini
@@ -1,13 +1,10 @@
 [DEFAULT]
 prefs =
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 
 [browser_sessionStore.js]
--- a/mail/test/browser/smime/browser.ini
+++ b/mail/test/browser/smime/browser.ini
@@ -1,14 +1,11 @@
 [DEFAULT]
 prefs =
   browser.tabs.remote.autostart=false
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 support-files = data/**
 
--- a/mail/test/browser/startup-firstrun/browser.ini
+++ b/mail/test/browser/startup-firstrun/browser.ini
@@ -1,13 +1,10 @@
 [DEFAULT]
 prefs =
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.enabled=false,
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 
--- a/mail/test/browser/subscribe/browser.ini
+++ b/mail/test/browser/subscribe/browser.ini
@@ -1,13 +1,10 @@
 [DEFAULT]
 prefs =
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 
 [browser_newsFilter.js]
--- a/mail/test/browser/tabmail/browser.ini
+++ b/mail/test/browser/tabmail/browser.ini
@@ -1,14 +1,11 @@
 [DEFAULT]
 prefs =
   browser.tabs.remote.autostart=false
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 
 [browser_closing.js]
--- a/mail/test/browser/utils/browser.ini
+++ b/mail/test/browser/utils/browser.ini
@@ -1,14 +1,11 @@
 [DEFAULT]
 prefs =
   browser.tabs.remote.autostart=false
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
 
 [browser_extensionSupport.js]
--- a/mail/test/static/browser.ini
+++ b/mail/test/static/browser.ini
@@ -1,14 +1,11 @@
 [DEFAULT]
 head = head.js
 prefs =
-  ldap_2.servers.osx.description=
-  ldap_2.servers.osx.dirType=-1
-  ldap_2.servers.osx.uri=
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 skip-if = debug
 subsuite = thunderbird
 
--- a/mailnews/addrbook/test/unit/head_migration.js
+++ b/mailnews/addrbook/test/unit/head_migration.js
@@ -8,19 +8,16 @@ var { MailMigrator } = ChromeUtils.impor
 );
 var { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
 
 // Ensure the profile directory is set up
 var profileDir = do_get_profile();
 
-// OSX Address Book deactivation (Bug 955842)
-Services.prefs.deleteBranch("ldap_2.servers.osx.");
-
 registerCleanupFunction(function() {
   load("../../../resources/mailShutdown.js");
 });
 
 /**
  * Copies a file into the profile directory.
  *
  * @param {String} path      Path to the source data
--- a/mailnews/test/resources/abSetup.js
+++ b/mailnews/test/resources/abSetup.js
@@ -34,22 +34,16 @@ var kCABData = {
   fileName: "history.sqlite",
   dirName: "Collected Addresses",
   dirType: 101,
   dirPrefID: "ldap_2.servers.history",
   readOnly: false,
   position: 2,
 };
 
-// Windows (Outlook Express) Address Book deactivation. (Bug 448859)
-Services.prefs.deleteBranch("ldap_2.servers.oe.");
-
-// OSX Address Book deactivation (Bug 955842)
-Services.prefs.deleteBranch("ldap_2.servers.osx.");
-
 // This currently applies to all address books of local type.
 var kNormalPropertiesURI =
   "chrome://messenger/content/addressbook/abAddressBookNameDialog.xhtml";
 
 /**
  * Installs a pre-prepared address book file into the profile directory.
  * This version is for JS/SQLite address books, if you create a new type,
  * replace this function to test them.