Merge fx-team to m-c. a=merge

CLOSED TREE
2015-02-12 18:02:35 -05:00
parent 67f4e89780 dc69e417b9
commit 1d8e85f764
171 changed files with 6593 additions and 1382 deletions
--- a/addon-sdk/source/python-lib/cuddlefish/prefs.py
+++ b/addon-sdk/source/python-lib/cuddlefish/prefs.py
@@ -238,8 +238,6 @@ DEFAULT_TEST_PREFS = {
    'media.eme.apiVisible': True,
    # Don't forceably kill content processes after a timeout
    'dom.ipc.tabs.shutdownTimeoutSecs': 0,
-    # Don't show the search first run UI by default
-    'browser.search.highlightCount': 0,
    'general.useragent.locale': "en-US",
    'intl.locale.matchOS': "en-US",
    'dom.indexedDB.experimental': True