Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / android_webview / test / shell / src / org / chromium / android_webview / test / NullContentsClient.java

diff --git a/src/android_webview/test/shell/src/org/chromium/android_webview/test/NullContentsClient.java b/src/android_webview/test/shell/src/org/chromium/android_webview/test/NullContentsClient.java
index 34e6ca5..85c994b 100644 (file)
--- a/src/android_webview/test/shell/src/org/chromium/android_webview/test/NullContentsClient.java
+++ b/src/android_webview/test/shell/src/org/chromium/android_webview/test/NullContentsClient.java
@@ -9,6 +9,7 @@ import android.graphics.Picture;
 import android.net.http.SslError;
 import android.os.Looper;
 import android.os.Message;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.webkit.ConsoleMessage;
@@ -17,17 +18,24 @@ import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
 
 import org.chromium.android_webview.AwContentsClient;
+import org.chromium.android_webview.AwContentsClientBridge;
 import org.chromium.android_webview.AwHttpAuthHandler;
 import org.chromium.android_webview.InterceptedRequestData;
 import org.chromium.android_webview.JsPromptResultReceiver;
 import org.chromium.android_webview.JsResultReceiver;
+import org.chromium.android_webview.permission.AwPermissionRequest;
 import org.chromium.base.ThreadUtils;
 
+import java.security.Principal;
+
 /**
  * As a convience for tests that only care about specefic callbacks, this class provides
  * empty implementations of all abstract methods.
  */
 public class NullContentsClient extends AwContentsClient {
+
+    private static final String TAG = "NullContentsClient";
+
     public NullContentsClient() {
         this(ThreadUtils.getUiThreadLooper());
     }
@@ -87,6 +95,14 @@ public class NullContentsClient extends AwContentsClient {
     }
 
     @Override
+    public void onReceivedClientCertRequest(
+            final AwContentsClientBridge.ClientCertificateRequestCallback callback,
+            final String[] keyTypes, final Principal[] principals, final String host,
+            final int port) {
+        callback.proceed(null, null);
+    }
+
+    @Override
     public void onReceivedLoginRequest(String realm, String account, String args) {
     }
 
@@ -101,19 +117,27 @@ public class NullContentsClient extends AwContentsClient {
 
     @Override
     public void handleJsAlert(String url, String message, JsResultReceiver receiver) {
+        Log.i(TAG, "handleJsAlert(" + url + ", " + message + ")");
+        receiver.cancel();
     }
 
     @Override
     public void handleJsBeforeUnload(String url, String message, JsResultReceiver receiver) {
+        Log.i(TAG, "handleJsBeforeUnload(" + url + ", " + message + ")");
+        receiver.confirm();
     }
 
     @Override
     public void handleJsConfirm(String url, String message, JsResultReceiver receiver) {
+        Log.i(TAG, "handleJsConfirm(" + url + ", " + message + ")");
+        receiver.cancel();
     }
 
     @Override
     public void handleJsPrompt(
             String url, String message, String defaultValue, JsPromptResultReceiver receiver) {
+        Log.i(TAG, "handleJsPrompt(" + url + ", " + message + ")");
+        receiver.cancel();
     }
 
     @Override
@@ -196,4 +220,13 @@ public class NullContentsClient extends AwContentsClient {
     public Bitmap getDefaultVideoPoster() {
         return null;
     }
+
+    @Override
+    public void onPermissionRequest(AwPermissionRequest awPermissionRequest) {
+        awPermissionRequest.deny();
+    }
+
+    @Override
+    public void onPermissionRequestCanceled(AwPermissionRequest awPermissionRequest) {
+    }
 }