Reland "Use resource throttle to implement shouldOverrideUrlLoading, core change"

Now that https://codereview.chromium.org/1381003004/ has landed we can
reland this patch since we now receive a didFinishLoad callback when
the current navigation finishes even in the case where a new navigation
has reached a provisional state.

This reverts commit e5c3091df04749b232359b6ef22938006af840d5.

TBR=palmer@chromium.org,jam@chromium.org
BUG=325351

Review URL: https://codereview.chromium.org/1424263003

Cr-Commit-Position: refs/heads/master@{#358719}

2 files changed, 0 insertions, 19 deletions

diff --git a/android_webview/native/aw_contents_client_bridge.cc b/android_webview/native/aw_contents_client_bridge.cc
index 5c4a1b3..9e570af 100644
--- a/android_webview/native/aw_contents_client_bridge.cc
+++ b/android_webview/native/aw_contents_client_bridge.cc
@@ -340,21 +340,6 @@ void AwContentsClientBridge::RunBeforeUnloadDialog(
       env, obj.obj(), jurl.obj(), jmessage.obj(), callback_id);
 }
 
-bool AwContentsClientBridge::ShouldOverrideUrlLoading(const base::string16& url,
-                                                      bool has_user_gesture,
-                                                      bool is_redirect,
-                                                      bool is_main_frame) {
-  JNIEnv* env = AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
-  if (obj.is_null())
-    return false;
-  ScopedJavaLocalRef<jstring> jurl = ConvertUTF16ToJavaString(env, url);
-  devtools_instrumentation::ScopedEmbedderCallbackTask(
-      "shouldOverrideUrlLoading");
-  return Java_AwContentsClientBridge_shouldOverrideUrlLoading(
-      env, obj.obj(), jurl.obj(), has_user_gesture, is_redirect, is_main_frame);
-}
-
 void AwContentsClientBridge::ConfirmJsResult(JNIEnv* env,
                                              jobject,
                                              int id,
diff --git a/android_webview/native/aw_contents_client_bridge.h b/android_webview/native/aw_contents_client_bridge.h
index 6908c92d..74f13e0 100644
--- a/android_webview/native/aw_contents_client_bridge.h
+++ b/android_webview/native/aw_contents_client_bridge.h
@@ -54,10 +54,6 @@ class AwContentsClientBridge : public AwContentsClientBridgeBase {
       const base::string16& message_text,
       const content::JavaScriptDialogManager::DialogClosedCallback& callback)
       override;
-  bool ShouldOverrideUrlLoading(const base::string16& url,
-                                bool has_user_gesture,
-                                bool is_redirect,
-                                bool is_main_frame) override;
 
   // Methods called from Java.
   void ProceedSslError(JNIEnv* env, jobject obj, jboolean proceed, jint id);