Allow #pixelsX = #pixelsY +-1 to fix WebRtcGetUserMediaBrowserTest.TestGetUserMediaAspectX

content/test/data/media/getusermedia.html

Index: content/test/data/media/getusermedia.html
diff --git a/content/test/data/media/getusermedia.html b/content/test/data/media/getusermedia.html
index ddd0f0906b98f295dc7921aae51a08ca1a012176..7da11753b19c1a0b528772aa2cfce73275d93165 100644
--- a/content/test/data/media/getusermedia.html
+++ b/content/test/data/media/getusermedia.html
@@ -340,7 +340,7 @@
       }
       // Walk vertically counting light green pixels.
       for (var y = 0; y < aperture; ++y) {
-        if (pixels.data[4 * y * aperture + 1] != 135)
+        if (pixels.data[4 * y * aperture + 1] != COLOR_BACKGROUND_GREEN)
           lightGreenPixelsY++;
       }
       if (lightGreenPixelsX > maxLightGreenPixelsX)
@@ -350,10 +350,10 @@
 
       if (++iterations > maxIterations) {
         clearInterval(detectorInterval);
-        // Allow maxLightGreenPixelsY = maxLightGreenPixelsX -1 due to sub pixel
-        // rendering on Mac.
-        if ((maxLightGreenPixelsY != maxLightGreenPixelsX &&
-             maxLightGreenPixelsY != maxLightGreenPixelsX -1) ||
+        // Allow maxLightGreenPixelsY = maxLightGreenPixelsX +-1 due to 
+        // possible subpixel rendering on Mac and Android.
+        if (maxLightGreenPixelsY > maxLightGreenPixelsX + 1 ||
+            maxLightGreenPixelsY < maxLightGreenPixelsX -1 ||
             maxLightGreenPixelsY == 0 ||
             maxLightGreenPixelsX == width || maxLightGreenPixelsY == height) {
           failTest("Aspect ratio corrupted. X " + maxLightGreenPixelsX  +