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

MozReview-Commit-ID: DXTWNHWatEv

--HG--
extra : rebase_source : da5e99ba431f1bc826101d8cc1e1bcb599aaa5fb

caps/tests/mochitest/chrome.ini

@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 support-files =
   file_disableScript.html
   !/caps/tests/mochitest/file_disableScript.html

caps/tests/mochitest/mochitest.ini

@@ -7,9 +7,7 @@ support-files =
 [test_app_principal_equality.html]
 [test_bug246699.html]
 [test_bug292789.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_bug423375.html]
 [test_bug470804.html]
 [test_disallowInheritPrincipal.html]
 [test_extensionURL.html]
-skip-if = (buildapp == 'b2g') # nonsensical on b2g