Remove DrawGLFunctor CleanupReference.

android_webview/glue/java/src/com/android/webview/chromium/DrawGLFunctor.java

Index: android_webview/glue/java/src/com/android/webview/chromium/DrawGLFunctor.java
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/DrawGLFunctor.java b/android_webview/glue/java/src/com/android/webview/chromium/DrawGLFunctor.java
index 9192b340ddba0c79bacdb8811d4b344c961ab1a8..4dc44c378e05e38487c894daf37a0b18dd7973fb 100644
--- a/android_webview/glue/java/src/com/android/webview/chromium/DrawGLFunctor.java
+++ b/android_webview/glue/java/src/com/android/webview/chromium/DrawGLFunctor.java
@@ -11,7 +11,6 @@ import android.view.View;
 import com.android.webview.chromium.WebViewDelegateFactory.WebViewDelegate;
 
 import org.chromium.android_webview.AwContents;
-import org.chromium.content.common.CleanupReference;
 
 /**
  * Simple Java abstraction and wrapper for the native DrawGLFunctor flow.
@@ -23,13 +22,11 @@ class DrawGLFunctor implements AwContents.NativeDrawGLFunctor {
     private static final String TAG = DrawGLFunctor.class.getSimpleName();
 
     // Pointer to native side instance
-    private final CleanupReference mCleanupReference;
     private final DestroyRunnable mDestroyRunnable;
     private final WebViewDelegate mWebViewDelegate;
 
     public DrawGLFunctor(long viewContext, WebViewDelegate webViewDelegate) {
         mDestroyRunnable = new DestroyRunnable(nativeCreateGLFunctor(viewContext));
-        mCleanupReference = new CleanupReference(this, mDestroyRunnable);
         mWebViewDelegate = webViewDelegate;
     }
 
@@ -72,6 +69,11 @@ class DrawGLFunctor implements AwContents.NativeDrawGLFunctor {
         return sSupportFunctorReleasedCallback;
     }
 
+    @Override
+    public Runnable getDestroyRunnable() {
+        return mDestroyRunnable;

[boliu, 2016/04/27 17:08:46]

Assert everywhere mNativeDrawGLFunctor is used that it's not 0

+    }
+
     public static void setChromiumAwDrawGLFunction(long functionPointer) {
         nativeSetChromiumAwDrawGLFunction(functionPointer);
     }