Issue #1053 - Part 2a: Remove android from /layout (partial)

This removes android code from base, build, forms, generic, inspector, style,
printing, tools and xul.

3 files changed, 4 insertions, 21 deletions

diff --git a/layout/forms/test/chrome.ini b/layout/forms/test/chrome.ini
index 32d862eec..87aadcdb2 100644
--- a/layout/forms/test/chrome.ini
+++ b/layout/forms/test/chrome.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = os == 'android'
 support-files =
   bug536567_iframe.html
   bug536567_subframe.html
diff --git a/layout/forms/test/mochitest.ini b/layout/forms/test/mochitest.ini
index cc8519db7..ef1632a7a 100644
--- a/layout/forms/test/mochitest.ini
+++ b/layout/forms/test/mochitest.ini
@@ -9,58 +9,44 @@ support-files =
 [test_bug345267.html]
 [test_bug346043.html]
 [test_bug348236.html]
-skip-if = toolkit == 'android' || e10s || os == 'mac' # mac(select form control popup behavior is different)
+skip-if = toolkit == e10s || os == 'mac' # mac(select form control popup behavior is different)
 [test_bug353539.html]
 [test_bug365410.html]
 [test_bug378670.html]
-skip-if = toolkit == 'android' #TIMED_OUT
 [test_bug402198.html]
 [test_bug411236.html]
 [test_bug446663.html]
-skip-if = toolkit == 'android'
 [test_bug476308.html]
 [test_bug477531.html]
 [test_bug477700.html]
 [test_bug478219.xhtml]
-skip-if = toolkit == 'android'
 [test_bug534785.html]
 [test_bug542914.html]
 [test_bug549170.html]
 [test_bug562447.html]
 [test_bug563642.html]
 [test_bug564115.html]
-skip-if = toolkit == 'android' #TIMED_OUT
 [test_bug571352.html]
-skip-if = (os == 'mac' && os_version == '10.10') || toolkit == 'android' #TIMED_OUT # OS X 10.10 - bug 947690
+skip-if = (os == 'mac' && os_version == '10.10') # OS X 10.10 - bug 947690
 [test_bug572406.html]
 [test_bug572649.html]
-skip-if = toolkit == 'android' #TIMED_OUT
 [test_bug595310.html]
 [test_bug620936.html]
 [test_bug644542.html]
-skip-if = toolkit == 'android' #TIMED_OUT
 [test_bug672810.html]
-skip-if = toolkit == 'android'
 [test_bug704049.html]
 [test_bug717878_input_scroll.html]
 [test_bug869314.html]
 [test_bug903715.html]
-skip-if = toolkit == 'android' || e10s #select elements don't use an in-page popup on Android
 [test_bug935876.html]
-# Bug 1023472 - Fails when pushed into a different chunk on Android
-skip-if = toolkit == 'android'
 [test_bug957562.html]
 [test_bug960277.html]
 [test_bug961363.html]
-skip-if = toolkit == 'android' # Bug 1021644 - Fails when pushed into a different chunk on Android
 [test_bug1111995.html]
 [test_bug1301290.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' # b2g(resizing textarea not available in b2g) b2g-debug(resizing textarea not available in b2g) b2g-desktop(resizing textarea not available in b2g)
 [test_bug1305282.html]
 [test_listcontrol_search.html]
-skip-if = toolkit == 'android' #select elements don't use an in-page popup on Android
 [test_select_prevent_default.html]
 [test_select_vertical.html]
-skip-if = e10s || toolkit == 'android' # Bug 1170129 - vertical <select> popup not implemented for e10s # <select> elements don't use an in-page popup on Android
+skip-if = e10s # Bug 1170129 - vertical <select> popup not implemented for e10s
 [test_textarea_resize.html]
-skip-if = toolkit == 'android'
diff --git a/layout/forms/test/test_bug935876.html b/layout/forms/test/test_bug935876.html
index bb4090211..5df43e4f8 100644
--- a/layout/forms/test/test_bug935876.html
+++ b/layout/forms/test/test_bug935876.html
@@ -49,7 +49,6 @@ SimpleTest.waitForExplicitFinish();
 
 const kIsWin = navigator.platform.indexOf("Win") == 0;
 const kIsMac = navigator.platform.indexOf("Mac") == 0;
-const kIsAndroid = navigator.appVersion.indexOf("Android") != 0;
 
 function runTests()
 {
@@ -352,8 +351,7 @@ function runTests()
 
   // Mac uses native popup for dropdown.  Let's skip the tests for popup
   // since it's not handled in nsListControlFrame.
-  // Similarly, Android doesn't use popup for dropdown.
-  if (kIsMac || kIsAndroid) {
+  if (kIsMac) {
     finish();
     return;
   }