Upstream ShouldOverrideUrlLoading changes

android_webview/native/aw_contents_client_bridge.cc

Index: android_webview/native/aw_contents_client_bridge.cc
diff --git a/android_webview/native/aw_contents_client_bridge.cc b/android_webview/native/aw_contents_client_bridge.cc
index 9a85c28f93cfcaccb992908c9603701753e64718..15f1a1bc1e3d983598b386dbab03060d7b4d410f 100644
--- a/android_webview/native/aw_contents_client_bridge.cc
+++ b/android_webview/native/aw_contents_client_bridge.cc
@@ -154,6 +154,18 @@ void AwContentsClientBridge::RunBeforeUnloadDialog(
       env, obj.obj(), jurl.obj(), jmessage.obj(), callback_id);
 }
 
+bool AwContentsClientBridge::ShouldOverrideUrlLoading(
+    const base::string16& url) {
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
+  if (obj.is_null())
+    return false;
+  ScopedJavaLocalRef<jstring> jurl = ConvertUTF16ToJavaString(env, url);
+  return Java_AwContentsClientBridge_shouldOverrideUrlLoading(
+      env, obj.obj(),
+      jurl.obj());
+}
+
 void AwContentsClientBridge::ConfirmJsResult(JNIEnv* env,
                                              jobject,
                                              int id,