Revert of Fix TODOs related to SDK 24

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

Index: android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java
index 99dd3fa6a44bfd75c01dad80f70ccc834f4d3ab5..0ea08497cb7717c0143ce83d383b73c463d12917 100644
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java
@@ -63,6 +63,7 @@
 import java.io.BufferedWriter;
 import java.io.File;
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.concurrent.Callable;
 
@@ -1729,7 +1730,8 @@
         mAwContents.onConfigurationChanged(newConfig);
     }
 
-    @Override
+    //TODO(hush): add override after release.
+    //@Override
     public boolean onDragEvent(final DragEvent event) {
         mFactory.startYourEngines(false);
         if (checkNeedsPost()) {
@@ -2211,7 +2213,15 @@
 
         @Override
         public void super_startActivityForResult(Intent intent, int requestCode) {
-            mWebViewPrivate.super_startActivityForResult(intent, requestCode);
+            // TODO(hush): Use mWebViewPrivate.super_startActivityForResult
+            // after N release. crbug.com/543272.
+            try {
+                Method startActivityForResultMethod =
+                        View.class.getMethod("startActivityForResult", Intent.class, int.class);
+                startActivityForResultMethod.invoke(mWebView, intent, requestCode);
+            } catch (Exception e) {
+                throw new RuntimeException("Invalid reflection", e);
+            }
         }
 
         @Override