Bug 1619824 - Remove prefs disabling the OS X address book in tests. r=mkmelin

--HG--
extra : rebase_source : 0bb2290c419220902bf00efe43cc5725a2b6b342
extra : amend_source : ed70dd6cbcee136aee8d18f3f4f7da39f32110a7

calendar/test/browser/browser.ini

@@ -2,9 +2,6 @@
 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

calendar/test/browser/eventDialog/browser.ini

@@ -2,9 +2,6 @@
 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

calendar/test/browser/invitations/browser.ini

@@ -3,9 +3,6 @@ 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

calendar/test/browser/preferences/browser.ini

@@ -2,9 +2,6 @@
 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

calendar/test/browser/recurrence/browser.ini

@@ -2,9 +2,6 @@
 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

calendar/test/browser/recurrenceRotated/browser.ini

@@ -2,9 +2,6 @@
 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

calendar/test/browser/views/browser.ini

@@ -2,9 +2,6 @@
 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

mail/base/test/browser/browser.ini

@@ -1,8 +1,5 @@
 [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

mail/components/addrbook/test/browser/browser.ini

@@ -1,9 +1,6 @@
 [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

mail/components/cloudfile/test/browser/browser.ini

@@ -1,9 +1,6 @@
 [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

mail/components/enterprisepolicies/tests/browser/browser.ini

@@ -1,9 +1,6 @@
 [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

mail/components/enterprisepolicies/tests/browser/disable_app_update/browser.ini

@@ -1,8 +1,5 @@
 [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

mail/components/enterprisepolicies/tests/browser/disable_developer_tools/browser.ini

@@ -1,8 +1,5 @@
 [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

mail/components/extensions/test/browser/browser.ini

@@ -1,10 +1,7 @@
 [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
@@ -15,6 +12,7 @@ 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]

mail/components/extensions/test/xpcshell/xpcshell.ini

@@ -4,6 +4,7 @@ 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

mail/components/preferences/test/browser/browser.ini

@@ -1,9 +1,6 @@
 [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

mail/test/browser/account/browser.ini

@@ -1,9 +1,6 @@
 [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/test/browser/addrbook/browser.ini

@@ -1,8 +1,5 @@
 [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

mail/test/browser/attachment/browser.ini

@@ -1,9 +1,6 @@
 [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

mail/test/browser/cloudfile/browser.ini

@@ -2,9 +2,6 @@
 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/test/browser/composition/browser.ini

@@ -1,9 +1,6 @@
 [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/test/browser/content-policy/browser.ini

@@ -1,9 +1,6 @@
 [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

mail/test/browser/content-tabs/browser.ini

@@ -2,9 +2,6 @@
 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/test/browser/cookies/browser.ini

@@ -1,9 +1,6 @@
 [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

mail/test/browser/downloads/browser.ini

@@ -1,9 +1,6 @@
 [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

mail/test/browser/folder-display/browser.ini

@@ -1,9 +1,6 @@
 [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/test/browser/folder-pane/browser.ini

@@ -1,9 +1,6 @@
 [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/test/browser/folder-tree-modes/browser.ini

@@ -1,9 +1,6 @@
 [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/test/browser/folder-widget/browser.ini

@@ -1,8 +1,5 @@
 [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/test/browser/im/browser.ini

@@ -1,8 +1,5 @@
 [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/test/browser/instrumentation/browser.ini

@@ -1,8 +1,5 @@
 [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/test/browser/junk-commands/browser.ini

@@ -1,9 +1,6 @@
 [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

mail/test/browser/keyboard/browser.ini

@@ -1,9 +1,6 @@
 [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

mail/test/browser/message-header/browser.ini

@@ -1,9 +1,6 @@
 [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

mail/test/browser/message-reader/browser.ini

@@ -1,9 +1,6 @@
 [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

mail/test/browser/message-window/browser.ini

@@ -1,9 +1,6 @@
 [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

mail/test/browser/multiple-identities/browser.ini

@@ -1,9 +1,6 @@
 [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

mail/test/browser/newmailaccount/browser.ini

@@ -1,9 +1,6 @@
 [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

mail/test/browser/notification/browser.ini

@@ -1,8 +1,5 @@
 [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

mail/test/browser/override-main-menu-collapse/browser.ini

@@ -1,8 +1,5 @@
 [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/test/browser/pref-window/browser.ini

@@ -1,8 +1,5 @@
 [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

mail/test/browser/quick-filter-bar/browser.ini

@@ -1,8 +1,5 @@
 [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

mail/test/browser/search-window/browser.ini

@@ -1,9 +1,6 @@
 [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

mail/test/browser/session-store/browser.ini

@@ -1,8 +1,5 @@
 [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

mail/test/browser/smime/browser.ini

@@ -1,9 +1,6 @@
 [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

mail/test/browser/startup-firstrun/browser.ini

@@ -1,8 +1,5 @@
 [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/test/browser/subscribe/browser.ini

@@ -1,8 +1,5 @@
 [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

mail/test/browser/tabmail/browser.ini

@@ -1,9 +1,6 @@
 [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

mail/test/browser/utils/browser.ini

@@ -1,9 +1,6 @@
 [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

mail/test/static/browser.ini

@@ -1,9 +1,6 @@
 [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/addrbook/test/unit/head_migration.js

@@ -13,9 +13,6 @@ var { MailServices } = ChromeUtils.import(
 // 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");
 });

mailnews/test/resources/abSetup.js

@@ -39,12 +39,6 @@ var kCABData = {
   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";