Assert that AwGLFunctor instances do not leak.

android_webview/javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java
index 1166cac0e8ac198fb928488790ee5e6df8bafbf8..f3bfa7f4102e1f72c5b81a75bf7e177c16f0ff22 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java
@@ -13,6 +13,7 @@ import android.test.suitebuilder.annotation.LargeTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.android_webview.AwContents;
+import org.chromium.android_webview.AwGLFunctor;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.test.util.Criteria;
@@ -237,8 +238,10 @@ public class AwContentsGarbageCollectionTest extends AwTestBase {
                     return runTestOnUiThreadAndGetResult(new Callable<Boolean>() {
                         @Override
                         public Boolean call() {
-                            int count = AwContents.getNativeInstanceCount();
-                            return count <= MAX_IDLE_INSTANCES;
+                            int count_aw_contents = AwContents.getNativeInstanceCount();
+                            int count_aw_functor = AwGLFunctor.getNativeInstanceCount();
+                            return count_aw_contents <= MAX_IDLE_INSTANCES
+                                    && count_aw_functor <= MAX_IDLE_INSTANCES;
                         }
                     });
                 } catch (Exception e) {