Revert of Fix TODOs related to SDK 24

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package com.android.webview.chromium;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
@@ skipping 45 matching lines @@
 import org.chromium.android_webview.AwSettings;
 import org.chromium.android_webview.ResourcesContextWrapperFactory;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.content.browser.SmartClipProvider;
 import org.chromium.content_public.browser.NavigationHistory;
 
 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;
 
 /**
  * This class is the delegate to which WebViewProxy forwards all API calls.
  *
  * Most of the actual functionality is implemented by AwContents (or ContentViewCore within
  * it). This class also contains WebView-specific APIs that require the creation of other
  * adapters (otherwise org.chromium.content would depend on the webview.chromium package)
  * and a small set of no-op deprecated APIs.
@@ skipping 1646 matching lines @@
                 @Override
                 public void run() {
                     onConfigurationChanged(newConfig);
                 }
             });
             return;
         }
         mAwContents.onConfigurationChanged(newConfig);
     }
 
-    @Override
+    //TODO(hush): add override after release.
+    //@Override
     public boolean onDragEvent(final DragEvent event) {
         mFactory.startYourEngines(false);
         if (checkNeedsPost()) {
             boolean ret = mFactory.runOnUiThreadBlocking(new Callable<Boolean>() {
                 @Override
                 public Boolean call() {
                     return onDragEvent(event);
                 }
             });
             return ret;
@@ skipping 461 matching lines @@
             // Intentional no-op
         }
 
         @Override
         public int super_getScrollBarStyle() {
             return mWebViewPrivate.super_getScrollBarStyle();
         }
 
         @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
         public boolean awakenScrollBars() {
             mWebViewPrivate.awakenScrollBars(0);
             // TODO: modify the WebView.PrivateAccess to provide a return value.
             return true;
         }
 
         @Override
@@ skipping 38 matching lines @@
         mAwContents.extractSmartClipData(x, y, width, height);
     }
 
     // Implements SmartClipProvider
     @Override
     public void setSmartClipResultHandler(final Handler resultHandler) {
         checkThread();
         mAwContents.setSmartClipResultHandler(resultHandler);
     }
 }