Bug 1310297 - Remove test annotations using b2g, mulet or gonk: browser. r=RyanVM

MozReview-Commit-ID: LDNr97hKpc8

--HG--
extra : rebase_source : 64fd1735a2db892c5e2d2976667ca2374b9b0554

browser/base/content/test/alerts/browser.ini

@@ -10,4 +10,3 @@ support-files =
 [browser_notification_permission_migration.js]
 [browser_notification_replace.js]
 [browser_notification_tab_switching.js]
-skip-if = buildapp == 'mulet'

browser/base/content/test/chrome/chrome.ini

@@ -1,4 +1,3 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_aboutCrashed.xul]

browser/base/content/test/general/browser.ini

@@ -155,7 +155,7 @@ skip-if = os == "mac" # The Fitt's Law back button is not supported on OS X
 [browser_bookmark_popup.js]
 skip-if = (os == "linux" && debug) # mouseover not reliable on linux debug builds
 [browser_bookmark_titles.js]
-skip-if = buildapp == 'mulet' || toolkit == "windows" # Disabled on Windows due to frequent failures (bugs 825739, 841341)
+skip-if = toolkit == "windows" # Disabled on Windows due to frequent failures (bugs 825739, 841341)
 [browser_bug321000.js]
 subsuite = clipboard
 skip-if = true # browser_bug321000.js is disabled because newline handling is shaky (bug 592528)
@@ -179,9 +179,7 @@ skip-if = true # bug 428712
 [browser_bug432599.js]
 [browser_bug435035.js]
 [browser_bug435325.js]
-skip-if = buildapp == 'mulet'
 [browser_bug441778.js]
-skip-if = buildapp == 'mulet'
 [browser_bug455852.js]
 [browser_bug460146.js]
 [browser_bug462289.js]
@@ -189,11 +187,9 @@ skip-if = toolkit == "cocoa"
 [browser_bug462673.js]
 [browser_bug477014.js]
 [browser_bug479408.js]
-skip-if = buildapp == 'mulet'
 [browser_bug481560.js]
 [browser_bug484315.js]
 [browser_bug491431.js]
-skip-if = buildapp == 'mulet'
 [browser_bug495058.js]
 [browser_bug517902.js]
 skip-if = (os == 'linux' && e10s) # bug 1161699
@@ -203,11 +199,10 @@ skip-if = (os == 'linux' && e10s) # bug 1161699
 [browser_bug533232.js]
 [browser_bug537013.js]
 subsuite = clipboard
-skip-if = buildapp == 'mulet' || e10s # Bug 1134458 - Find bar doesn't work correctly in a detached tab
+skip-if = e10s # Bug 1134458 - Find bar doesn't work correctly in a detached tab
 [browser_bug537474.js]
 [browser_bug550565.js]
 [browser_bug553455.js]
-skip-if = buildapp == 'mulet' # Bug 1066070 - I don't think either popup notifications nor addon install stuff works on mulet?
 [browser_bug555224.js]
 [browser_bug555767.js]
 [browser_bug559991.js]
@@ -246,11 +241,10 @@ skip-if = true # bug 1057615
 [browser_bug624734.js]
 [browser_bug633691.js]
 [browser_bug647886.js]
-skip-if = buildapp == 'mulet'
 [browser_bug655584.js]
 [browser_bug664672.js]
 [browser_bug676619.js]
-skip-if = buildapp == 'mulet' || os == "mac" # mac: Intermittent failures, bug 925225
+skip-if = os == "mac" # mac: Intermittent failures, bug 925225
 [browser_bug678392.js]
 skip-if = os == "mac" # Bug 1102331 - does focus things on the content window which break in e10s mode (still causes orange on Mac 10.10)
 [browser_bug710878.js]
@@ -271,7 +265,6 @@ tags = mcb
 tags = mcb
 [browser_bug906190.js]
 tags = mcb
-skip-if = buildapp == "mulet" # Bug 1093642 - test manipulates content and relies on content focus
 [browser_mixedContentFromOnunload.js]
 tags = mcb
 [browser_mixedContentFramesOnHttp.js]
@@ -312,7 +305,7 @@ skip-if = true # browser_drag.js is disabled, as it needs to be updated for the
 [browser_focusonkeydown.js]
 [browser_fullscreen-window-open.js]
 tags = fullscreen
-skip-if = buildapp == 'mulet' || os == "linux" # Linux: Intermittent failures - bug 941575.
+skip-if = os == "linux" # Linux: Intermittent failures - bug 941575.
 [browser_fxaccounts.js]
 support-files = fxa_profile_handler.sjs
 [browser_fxa_migrate.js]
@@ -323,7 +316,6 @@ skip-if = e10s # Bug 863514 - no gesture support.
 [browser_getshortcutoruri.js]
 [browser_hide_removing.js]
 [browser_homeDrop.js]
-skip-if = buildapp == 'mulet'
 [browser_identity_UI.js]
 [browser_insecureLoginForms.js]
 [browser_invalid_uri_back_forward_manipulation.js]
@@ -343,15 +335,12 @@ subsuite = clipboard
 tags = mcb
 [browser_modifiedclick_inherit_principal.js]
 [browser_offlineQuotaNotification.js]
-skip-if = buildapp == 'mulet'
 [browser_feed_discovery.js]
 support-files = feed_discovery.html
 [browser_gZipOfflineChild.js]
-skip-if = buildapp == 'mulet' # Bug 1066070 - I don't think either popup notifications nor addon install stuff works?
 support-files = test_offline_gzip.html gZipOfflineChild.cacheManifest gZipOfflineChild.cacheManifest^headers^ gZipOfflineChild.html gZipOfflineChild.html^headers^
 [browser_overflowScroll.js]
 [browser_pageInfo.js]
-skip-if = buildapp == 'mulet'
 [browser_page_style_menu.js]
 [browser_page_style_menu_update.js]
 [browser_parsable_css.js]
@@ -364,15 +353,11 @@ support-files =
 [browser_pinnedTabs.js]
 [browser_plainTextLinks.js]
 [browser_popupUI.js]
-skip-if = buildapp == 'mulet'
 [browser_popup_blocker.js]
 skip-if = (os == 'linux') || (e10s && debug) # Frequent bug 1081925 and bug 1125520 failures
 [browser_printpreview.js]
-skip-if = buildapp == 'mulet'
 [browser_private_browsing_window.js]
-skip-if = buildapp == 'mulet'
 [browser_private_no_prompt.js]
-skip-if = buildapp == 'mulet'
 [browser_purgehistory_clears_sh.js]
 [browser_PageMetaData_pushstate.js]
 [browser_refreshBlocker.js]
@@ -389,17 +374,12 @@ support-files =
 [browser_sanitize-passwordDisabledHosts.js]
 [browser_sanitize-sitepermissions.js]
 [browser_sanitize-timespans.js]
-skip-if = buildapp == 'mulet'
 [browser_sanitizeDialog.js]
-skip-if = buildapp == 'mulet'
 [browser_save_link-perwindowpb.js]
-skip-if = buildapp == 'mulet' || (e10s && debug && os == "win") # Bug 1280505
+skip-if = e10s && debug && os == "win" # Bug 1280505
 [browser_save_private_link_perwindowpb.js]
-skip-if = buildapp == 'mulet'
 [browser_save_link_when_window_navigates.js]
-skip-if = buildapp == 'mulet'
 [browser_save_video.js]
-skip-if = buildapp == 'mulet'
 [browser_save_video_frame.js]
 [browser_scope.js]
 [browser_contentSearchUI.js]
@@ -415,16 +395,11 @@ run-if = e10s
 [browser_syncui.js]
 [browser_tab_close_dependent_window.js]
 [browser_tabDrop.js]
-skip-if = buildapp == 'mulet'
 [browser_tabReorder.js]
-skip-if = buildapp == 'mulet'
 [browser_tab_detach_restore.js]
 [browser_tab_drag_drop_perwindow.js]
-skip-if = buildapp == 'mulet'
 [browser_tab_dragdrop.js]
-skip-if = buildapp == 'mulet'
 [browser_tab_dragdrop2.js]
-skip-if = buildapp == 'mulet'
 [browser_tabbar_big_widgets.js]
 skip-if = os == "linux" || os == "mac" # No tabs in titlebar on linux
                                        # Disabled on OS X because of bug 967917
@@ -472,7 +447,6 @@ tags = trackingprotection
 support-files =
   trackingPage.html
 [browser_typeAheadFind.js]
-skip-if = buildapp == 'mulet'
 [browser_unknownContentType_title.js]
 [browser_unloaddialogs.js]
 [browser_utilityOverlay.js]
@@ -487,7 +461,6 @@ skip-if = true # Bug 1005420 - fails intermittently. also with e10s enabled: biz
 skip-if = (os == "win" && !debug)
 [browser_web_channel.js]
 [browser_windowopen_reflows.js]
-skip-if = buildapp == 'mulet'
 [browser_zbug569342.js]
 skip-if = e10s || debug # Bug 1094240 - has findbar-related failures
 [browser_registerProtocolHandler_notification.js]

browser/base/content/test/general/mochitest.ini

@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   audio.ogg
   bug364677-data.xml
@@ -25,4 +24,4 @@ support-files =
 [test_bug364677.html]
 [test_bug395533.html]
 [test_offlineNotification.html]
-skip-if = buildapp == 'mulet' || e10s # Mulet: Bug 1066070; e10s: Bug 1257785
+skip-if = e10s # Bug 1257785

browser/base/content/test/newtab/browser.ini

@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = (buildapp == 'mulet') || (os == 'linux') # Bug 1243103, Bug 1243398, etc.
+skip-if = (os == 'linux') # Bug 1243103, Bug 1243398, etc.
 support-files =
   head.js
 

browser/base/content/test/plugins/browser.ini

@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = buildapp == "mulet"
 support-files =
   blocklist_proxy.js
   blockNoPlugins.xml

browser/base/content/test/social/browser.ini

@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = buildapp == "mulet"
 support-files =
   blocklist.xml
   head.js

browser/base/content/test/webrtc/browser.ini

@@ -5,7 +5,7 @@ support-files =
   head.js
 
 [browser_devices_get_user_media.js]
-skip-if = buildapp == 'mulet' || (os == "linux" && debug) # linux: bug 976544
+skip-if = (os == "linux" && debug) # linux: bug 976544
 [browser_devices_get_user_media_anim.js]
 [browser_devices_get_user_media_in_frame.js]
 [browser_devices_get_user_media_tear_off_tab.js]

browser/components/contextualidentity/test/browser/browser.ini

@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = buildapp == "mulet"
 support-files =
   empty_file.html
   file_reflect_cookie_into_title.html

browser/components/customizableui/test/browser.ini

@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = buildapp == "mulet"
 support-files =
   head.js
   support/test_967000_charEncoding_page.html

browser/components/downloads/test/browser/browser.ini

@@ -2,7 +2,6 @@
 support-files = head.js
 
 [browser_basic_functionality.js]
-skip-if = buildapp == "mulet"
 [browser_first_download_panel.js]
 skip-if = os == "linux" # Bug 949434
 [browser_overflow_anchor.js]

browser/components/downloads/test/unit/xpcshell.ini

@@ -2,6 +2,6 @@
 head = head.js
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_DownloadsCommon.js]

browser/components/feeds/test/chrome/chrome.ini

@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files = sample_feed.atom
   !/browser/components/feeds/test/bug408328-data.xml
   !/browser/components/feeds/test/valid-feed.xml
@@ -8,5 +7,4 @@ support-files = sample_feed.atom
 [test_423060.xul]
 [test_bug368464.html]
 [test_bug408328.html]
-skip-if= buildapp == 'mulet'
 [test_maxSniffing.html]

browser/components/feeds/test/mochitest.ini

@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g'
 support-files =
   bug368464-data.xml
   bug408328-data.xml

browser/components/feeds/test/unit/xpcshell.ini

@@ -2,7 +2,7 @@
 head = head_feeds.js
 tail = 
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_355473.js]
 [test_758990.js]

browser/components/migration/tests/unit/xpcshell.ini

@@ -2,7 +2,7 @@
 head = head_migration.js
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files =
   Library/**
   AppData/**

browser/components/newtab/tests/xpcshell/xpcshell.ini

@@ -2,7 +2,7 @@
 head =
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_AboutNewTabService.js]
 [test_NewTabPrefsProvider.js]

browser/components/originattributes/test/browser/browser.ini

@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = buildapp == "mulet"
 tags = usercontextid firstpartyisolation originattributes
 support-files =
   dummy.html

browser/components/places/tests/browser/browser.ini

@@ -3,7 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 [DEFAULT]
-skip-if = buildapp == "mulet"
 support-files =
   head.js
   framedPage.html

browser/components/places/tests/chrome/chrome.ini

@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files = head.js
 
 [test_0_bug510634.xul]

browser/components/places/tests/unit/xpcshell.ini

@@ -2,7 +2,7 @@
 head = head_bookmarks.js
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files =
   bookmarks.glue.html
   bookmarks.glue.json

browser/components/preferences/in-content/tests/browser.ini

@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = buildapp == "mulet"
 support-files =
   head.js
   privacypane_tests_perwindow.js
@@ -40,5 +39,5 @@ support-files =
   subdialog.xul
   subdialog2.xul
 [browser_telemetry.js]
-# Skip this test on Android and B2G as FHR and Telemetry are separate systems there.
-skip-if = !healthreport || !telemetry || (os == 'linux' && debug) || (os == 'android') || (os == 'b2g')
+# Skip this test on Android as FHR and Telemetry are separate systems there.
+skip-if = !healthreport || !telemetry || (os == 'linux' && debug) || (os == 'android')

browser/components/privatebrowsing/test/browser/browser.ini

@@ -1,6 +1,5 @@
 [DEFAULT]
 tags = openwindow
-skip-if = buildapp == "mulet"
 support-files =
   browser_privatebrowsing_concurrent_page.html
   browser_privatebrowsing_geoprompt_page.html

browser/components/search/test/browser.ini

@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = buildapp == 'mulet'
 support-files =
   426329.xml
   483086-1.xml

browser/components/sessionstore/test/browser.ini

@@ -88,7 +88,6 @@ skip-if = !e10s || !crashreporter
 [browser_dynamic_frames.js]
 [browser_form_restore_events.js]
 [browser_formdata.js]
-skip-if = buildapp == 'mulet'
 [browser_formdata_cc.js]
 [browser_formdata_format.js]
 [browser_formdata_xpath.js]

browser/components/sessionstore/test/unit/xpcshell.ini

@@ -2,7 +2,7 @@
 head = head.js
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files =
   data/sessionCheckpoints_all.json
   data/sessionstore_invalid.js

browser/components/shell/test/unit/xpcshell.ini

@@ -2,6 +2,6 @@
 head = 
 tail = 
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_421977.js]

browser/components/tests/unit/xpcshell.ini

@@ -1,7 +1,7 @@
 [DEFAULT]
 head = head.js
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files =
   distribution.ini
   data/engine-de-DE.xml

browser/components/translation/test/unit/xpcshell.ini

@@ -2,6 +2,6 @@
 head = 
 tail = 
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_cld2.js]

browser/experiments/test/xpcshell/xpcshell.ini

@@ -3,7 +3,7 @@ head = head.js
 tail =
 tags = addons
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files =
   experiments_1.manifest
   experiment-1.xpi

browser/modules/test/unit/social/xpcshell.ini

@@ -2,7 +2,7 @@
 head = head.js
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files = blocklist.xml
 
 [test_social.js]

browser/modules/test/xpcshell/xpcshell.ini

@@ -2,7 +2,7 @@
 head =
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_AttributionCode.js]
 skip-if = os != 'win'