Remove DrawGLFunctor CleanupReference.

android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java

Index: android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java
diff --git a/android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java b/android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java
index d03a662f2fe8f4f70a65b813740cd1770bc0766c..a2dd796ee5af0468b6e4dceab7bdf4c1ab9dd921 100644
--- a/android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java
+++ b/android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java
@@ -145,6 +145,7 @@ public class AwTestContainerView extends FrameLayout {
 
         public void requestRender(long viewContext, Canvas canvas, boolean waitForCompletion) {
             synchronized (mSyncLock) {
+                assert viewContext != 0;
                 assert mViewContext == 0 || mViewContext == viewContext;
                 mViewContext = viewContext;
                 super.requestRender();
@@ -451,6 +452,16 @@ public class AwTestContainerView extends FrameLayout {
         public void detach(View containerView) {
             if (isBackedByHardwareView()) mHardwareView.detachGLFunctor();
         }
+
+        @Override
+        public Runnable getDestroyRunnable() {
+            return new Runnable() {

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

this needs to be static to make the gc tests pass

[Tobias Sargeant, 2016/04/27 17:29:49]

Acknowledged.

+                @Override
+                public void run() {
+                    mContext = 0;

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

maybe assert everywhere mContext is used that it's not 0?

[Tobias Sargeant, 2016/04/27 17:29:49]

mContext is passed to requestRender as viewContext, and I added the assert.

+                }
+            };
+        }
     }
 
     // TODO: AwContents could define a generic class that holds an implementation similar to