Revert of Android: Add FramerateRange class

webrtc/api/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java

Index: webrtc/api/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java
diff --git a/webrtc/api/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java b/webrtc/api/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java
index 4e8761f6f82d5b1298e34230a97a4ee699cc9fac..2bd1e62324cc4716c5994615d660878c110ba131 100644
--- a/webrtc/api/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java
+++ b/webrtc/api/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java
@@ -289,7 +289,7 @@
     final SurfaceTextureHelper surfaceTextureHelper = SurfaceTextureHelper.create(
         "SurfaceTextureHelper test" /* threadName */, null /* sharedContext */);
     final FakeCapturerObserver observer = new FakeCapturerObserver();
-    capturer.startCapture(format.width, format.height, format.framerate.max,
+    capturer.startCapture(format.width, format.height, format.maxFramerate,
         surfaceTextureHelper, appContext, observer);
     // Make sure camera is started and first frame is received and then stop it.
     assertTrue(observer.WaitForCapturerToStart());
@@ -313,7 +313,7 @@
     final SurfaceTextureHelper surfaceTextureHelper = SurfaceTextureHelper.create(
         "SurfaceTextureHelper test" /* threadName */, null /* sharedContext */);
     final FakeCapturerObserver observer = new FakeCapturerObserver();
-    capturer.startCapture(format.width, format.height, format.framerate.max,
+    capturer.startCapture(format.width, format.height, format.maxFramerate,
         surfaceTextureHelper, appContext, observer);
     // Make sure camera is started and then stop it.
     assertTrue(observer.WaitForCapturerToStart());
@@ -363,7 +363,7 @@
 
     for(int i = 0; i < 3 ; ++i) {
       CameraEnumerationAndroid.CaptureFormat format = formats.get(i);
-      capturer.startCapture(format.width, format.height, format.framerate.max,
+      capturer.startCapture(format.width, format.height, format.maxFramerate,
           surfaceTextureHelper, appContext, observer);
       assertTrue(observer.WaitForCapturerToStart());
       observer.WaitForNextCapturedFrame();
@@ -412,7 +412,7 @@
     final SurfaceTextureHelper surfaceTextureHelper = SurfaceTextureHelper.create(
         "SurfaceTextureHelper test" /* threadName */, null /* sharedContext */);
     final FakeCapturerObserver observer = new FakeCapturerObserver();
-    capturer.startCapture(format.width, format.height, format.framerate.max,
+    capturer.startCapture(format.width, format.height, format.maxFramerate,
         surfaceTextureHelper, appContext, observer);
 
     if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.LOLLIPOP_MR1) {
@@ -437,7 +437,7 @@
     final SurfaceTextureHelper surfaceTextureHelper = SurfaceTextureHelper.create(
         "SurfaceTextureHelper test" /* threadName */, null /* sharedContext */);
     final FakeCapturerObserver observer = new FakeCapturerObserver();
-    capturer.startCapture(format.width, format.height, format.framerate.max,
+    capturer.startCapture(format.width, format.height, format.maxFramerate,
         surfaceTextureHelper, appContext, observer);
     waitUntilIdle(capturer);
 
@@ -463,7 +463,7 @@
     final SurfaceTextureHelper surfaceTextureHelper = SurfaceTextureHelper.create(
         "SurfaceTextureHelper test" /* threadName */, null /* sharedContext */);
     final FakeCapturerObserver observer = new FakeCapturerObserver();
-    capturer.startCapture(format.width, format.height, format.framerate.max,
+    capturer.startCapture(format.width, format.height, format.maxFramerate,
         surfaceTextureHelper, appContext, observer);
     capturer.stopCapture();
     release(capturer);
@@ -479,7 +479,7 @@
 
     List<CaptureFormat> formats = capturer.getSupportedFormats();
     CameraEnumerationAndroid.CaptureFormat format = formats.get(0);
-    capturer.startCapture(format.width, format.height, format.framerate.max,
+    capturer.startCapture(format.width, format.height, format.maxFramerate,
         surfaceTextureHelper, appContext, observer);
     assertTrue(observer.WaitForCapturerToStart());
 
@@ -489,7 +489,7 @@
     assertTrue(listOftimestamps.size() >= 1);
 
     format = formats.get(1);
-    capturer.startCapture(format.width, format.height, format.framerate.max,
+    capturer.startCapture(format.width, format.height, format.maxFramerate,
         surfaceTextureHelper, appContext, observer);
     observer.WaitForCapturerToStart();
     if (capturer.isCapturingToTexture()) {
@@ -553,7 +553,7 @@
     final SurfaceTextureHelper surfaceTextureHelper = SurfaceTextureHelper.create(
         "SurfaceTextureHelper test" /* threadName */, null /* sharedContext */);
     final FakeCapturerObserver observer = new FakeCapturerObserver();
-    capturer.startCapture(format.width, format.height, format.framerate.max,
+    capturer.startCapture(format.width, format.height, format.maxFramerate,
         surfaceTextureHelper, appContext, observer);
     // Make sure camera is started.
     assertTrue(observer.WaitForCapturerToStart());