GLProgramsTest 3.0

BUG=skia:

Review URL: https://codereview.chromium.org/1139743002
diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp
index b562167..d1891fe 100644
--- a/src/gpu/GrOvalRenderer.cpp
+++ b/src/gpu/GrOvalRenderer.cpp
@@ -2094,7 +2094,7 @@
     SkMatrix viewMatrix = GrTest::TestMatrix(random);
     GrColor color = GrRandomColor(random);
     bool useCoverageAA = random->nextBool();
-    SkRect circle = GrTest::TestRect(random);
+    SkRect circle = GrTest::TestSquare(random);
     return create_circle_batch(color, viewMatrix, useCoverageAA, circle,
                                GrTest::TestStrokeRec(random));
 }
@@ -2102,9 +2102,8 @@
 BATCH_TEST_DEFINE(EllipseBatch) {
     SkMatrix viewMatrix = GrTest::TestMatrixRectStaysRect(random);
     GrColor color = GrRandomColor(random);
-    bool useCoverageAA = random->nextBool();
-    SkRect ellipse = GrTest::TestRect(random);
-    return create_ellipse_batch(color, viewMatrix, useCoverageAA, ellipse,
+    SkRect ellipse = GrTest::TestSquare(random);
+    return create_ellipse_batch(color, viewMatrix, true, ellipse,
                                 GrTest::TestStrokeRec(random));
 }
 
@@ -2112,7 +2111,7 @@
     SkMatrix viewMatrix = GrTest::TestMatrix(random);
     GrColor color = GrRandomColor(random);
     bool useCoverageAA = random->nextBool();
-    SkRect ellipse = GrTest::TestRect(random);
+    SkRect ellipse = GrTest::TestSquare(random);
     return create_diellipse_batch(color, viewMatrix, useCoverageAA, ellipse,
                                   GrTest::TestStrokeRec(random));
 }