Upstream ShouldOverrideUrlLoading changes

android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java

 // Copyright (c) 2013 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 org.chromium.android_webview;
 
 import android.net.http.SslCertificate;
 import android.net.http.SslError;
 import android.webkit.ValueCallback;
 
@@ skipping 73 matching lines @@
         JsResultHandler handler = new JsResultHandler(this, id);
         mClient.handleJsPrompt(url, message, defaultValue, handler);
     }
 
     @CalledByNative
     private void handleJsBeforeUnload(String url, String message, int id) {
         JsResultHandler handler = new JsResultHandler(this, id);
         mClient.handleJsBeforeUnload(url, message, handler);
     }
 
+    @CalledByNative
+    private boolean shouldOverrideUrlLoading(String url) {
+        return mClient.shouldOverrideUrlLoading(url);
+    }
+
     void confirmJsResult(int id, String prompt) {
         if (mNativeContentsClientBridge == 0) return;
         nativeConfirmJsResult(mNativeContentsClientBridge, id, prompt);
     }
 
     void cancelJsResult(int id) {
         if (mNativeContentsClientBridge == 0) return;
         nativeCancelJsResult(mNativeContentsClientBridge, id);
     }
 
     //--------------------------------------------------------------------------------------------
     //  Native methods
     //--------------------------------------------------------------------------------------------
     private native void nativeProceedSslError(long nativeAwContentsClientBridge, boolean proceed,
             int id);
 
     private native void nativeConfirmJsResult(long nativeAwContentsClientBridge, int id,
             String prompt);
     private native void nativeCancelJsResult(long nativeAwContentsClientBridge, int id);
 }