Reland of Made EglBase an abstract class and cleaned up.

webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java

Index: webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
index 9d45c702e510fc9faa6537b46476e086bb460182..523c0e0c85ba093eba9f18b4d6ad21543ec40dd8 100644
--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
@@ -46,8 +46,6 @@
 import java.util.TimerTask;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
-import javax.microedition.khronos.egl.EGLContext;
 
 /**
  * Peer connection client implementation.
@@ -259,7 +257,7 @@
   }
 
   public void createPeerConnection(
-      final EGLContext renderEGLContext,
+      final EglBase.Context renderEGLContext,
       final VideoRenderer.Callbacks localRender,
       final VideoRenderer.Callbacks remoteRender,
       final SignalingParameters signalingParameters) {
@@ -429,7 +427,7 @@
     }
   }
 
-  private void createPeerConnectionInternal(EGLContext renderEGLContext) {
+  private void createPeerConnectionInternal(EglBase.Context renderEGLContext) {
     if (factory == null || isError) {
       Log.e(TAG, "Peerconnection factory is not created");
       return;
@@ -478,7 +476,7 @@
       }
       Log.d(TAG, "Opening camera: " + cameraDeviceName);
       videoCapturer = VideoCapturerAndroid.create(cameraDeviceName, null,
-          peerConnectionParameters.captureToTexture ? new EglBase.Context(renderEGLContext) : null);
+          peerConnectionParameters.captureToTexture ? renderEGLContext : null);
       if (videoCapturer == null) {
         reportError("Failed to open camera");
         return;