Issue mcp-graveyard/UXP#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, 11 insertions, 25 deletions

diff --git a/layout/base/tests/chrome/chrome.ini b/layout/base/tests/chrome/chrome.ini
index 2f6ca0ba8d..56454d3112 100644
--- a/layout/base/tests/chrome/chrome.ini
+++ b/layout/base/tests/chrome/chrome.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = os == 'android'
 support-files =
   animated.gif
   blue-32x32.png
diff --git a/layout/base/tests/mochitest.ini b/layout/base/tests/mochitest.ini
index 405697977c..fc616b1ef8 100644
--- a/layout/base/tests/mochitest.ini
+++ b/layout/base/tests/mochitest.ini
@@ -1,6 +1,4 @@
 [DEFAULT]
-# Android: SLOW_DIRECTORY;
-skip-if = toolkit == 'android'
 support-files =
   Ahem.ttf
   border_radius_hit_testing_iframe.html
@@ -224,23 +222,18 @@ support-files = file_bug607529.html
 skip-if = e10s # bug 1020135, nested oop iframes not supported
 support-files = bug921928_event_target_iframe_apps_oop.html
 [test_mozPaintCount.html]
-skip-if = toolkit == 'android'
 [test_scroll_event_ordering.html]
 [test_scroll_selection_into_view.html]
 support-files=scroll_selection_into_view_window.html
 [test_scroll_snapping.html]
-skip-if = buildapp == 'android' # bug 1041833
 [test_scroll_snapping_scrollbars.html]
-skip-if = buildapp == 'android' # bug 1041833
 [test_bug583889.html]
 support-files = bug583889_inner1.html bug583889_inner2.html
 [test_bug582771.html]
 [test_bug968148.html]
 support-files = bug968148_inner.html
 [test_bug603550.html]
-skip-if = toolkit == 'android' #TIMED_OUT
 [test_bug629838.html]
-skip-if = toolkit == 'android'
 [test_bug646757.html]
 [test_bug718809.html]
 [test_bug725426.html]
@@ -270,13 +263,12 @@ support-files =
 
 # because of bug 469208.
 [test_bug332655-1.html]
-skip-if = toolkit == 'android'
 [test_bug332655-2.html]
 [test_bug499538-1.html]
 [test_bug749186.html]
 [test_bug644768.html]
 [test_flush_on_paint.html]
-skip-if = true || (toolkit == 'android') || (toolkit == "cocoa") # Bug 688128, bug 539356
+skip-if = true || (toolkit == "cocoa") # Bug 688128, bug 539356
 [test_getBoxQuads_convertPointRectQuad.html]
 [test_bug687297.html]
 support-files =
@@ -294,7 +286,7 @@ support-files = bug1080361_inner.html
 [test_bug1093686.html]
 support-files = bug1093686_inner.html
 [test_bug1120705.html]
-skip-if = buildapp == 'android' || os == 'mac' || toolkit == 'gtk2' || toolkit == 'gtk3' # android does not have clickable scrollbars, mac does not have scrollbar down and up buttons, gtk may or may not have scrollbar buttons depending on theme
+skip-if = os == 'mac' || toolkit == 'gtk2' || toolkit == 'gtk3' # mac does not have scrollbar down and up buttons, gtk may or may not have scrollbar buttons depending on theme
 [test_bug1153130.html]
 support-files = bug1153130_inner.html
 [test_bug1162990.html]
diff --git a/layout/base/tests/test_reftests_with_caret.html b/layout/base/tests/test_reftests_with_caret.html
index d9b5d4a6c9..062c605b98 100644
--- a/layout/base/tests/test_reftests_with_caret.html
+++ b/layout/base/tests/test_reftests_with_caret.html
@@ -189,20 +189,15 @@ var tests = [
     function() {SpecialPowers.pushPrefEnv({'clear': [['layout.accessiblecaret.enabled']]}, nextTest);} ,
 ];
 
-if (navigator.appVersion.indexOf("Android") == -1 &&
-  SpecialPowers.Services.appinfo.name != "B2G") {
-  tests.push([ 'bug512295-1.html' , 'bug512295-1-ref.html' ]);
-  tests.push([ 'bug512295-2.html' , 'bug512295-2-ref.html' ]);
-  tests.push([ 'bug923376.html'   , 'bug923376-ref.html'   ]);
-  tests.push(function() {SpecialPowers.pushPrefEnv({'set': [['layout.css.overflow-clip-box.enabled', true]]}, nextTest);});
-  tests.push([ 'bug966992-1.html' , 'bug966992-1-ref.html' ]);
-  tests.push([ 'bug966992-2.html' , 'bug966992-2-ref.html' ]);
-  tests.push([ 'bug966992-3.html' , 'bug966992-3-ref.html' ]);
-  tests.push(function() {SpecialPowers.pushPrefEnv({'clear': [['layout.css.overflow-clip-box.enabled']]}, nextTest);});
-  tests.push([ 'bug1258308-1.html' , 'bug1258308-1-ref.html' ]); // maybe VK_END doesn't work on Android?
-} else {
-  is(SpecialPowers.getIntPref("layout.spellcheckDefault"), 0, "Spellcheck should be turned off for this platform or this if..else check removed");
-}
+tests.push([ 'bug512295-1.html' , 'bug512295-1-ref.html' ]);
+tests.push([ 'bug512295-2.html' , 'bug512295-2-ref.html' ]);
+tests.push([ 'bug923376.html'   , 'bug923376-ref.html'   ]);
+tests.push(function() {SpecialPowers.pushPrefEnv({'set': [['layout.css.overflow-clip-box.enabled', true]]}, nextTest);});
+tests.push([ 'bug966992-1.html' , 'bug966992-1-ref.html' ]);
+tests.push([ 'bug966992-2.html' , 'bug966992-2-ref.html' ]);
+tests.push([ 'bug966992-3.html' , 'bug966992-3-ref.html' ]);
+tests.push(function() {SpecialPowers.pushPrefEnv({'clear': [['layout.css.overflow-clip-box.enabled']]}, nextTest);});
+tests.push([ 'bug1258308-1.html' , 'bug1258308-1-ref.html' ]);
 
 if (navigator.platform.indexOf("Linux") >= 0 &&
     SpecialPowers.Services.appinfo.name != "B2G") {