[Android] Upstream Modal Dialogs functionality

content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java

Index: content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java
index af204ace6a6f2b7a9a74507ac3abeffcca96a0f6..f71083778d728b201cb57648224489283ba21ae2 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java
@@ -212,25 +212,26 @@ public class ContentViewClient {
 
     // Return true if the client will handle the JS alert.
     @CalledByNative
-    public boolean  onJsAlert(String url, String Message) {
+    public boolean  onJsAlert(String url, String Message, JsResultReceiver receiver) {

[joth, 2012/08/15 06:11:25]

maybe we mark all these @deprecated, with comment linking bug 138483 (or a new
dedicated bug) and pointing out these methods will be going away so don't write
new tests that rely on them.

         return false;
     }
 
     // Return true if the client will handle the JS before unload dialog.
     @CalledByNative
-    public boolean onJsBeforeUnload(String url, String message) {
+    public boolean onJsBeforeUnload(String url, String message, JsResultReceiver receiver) {
         return false;
     }
 
     // Return true if the client will handle the JS confirmation prompt.
     @CalledByNative
-    public boolean onJsConfirm(String url, String message) {
+    public boolean onJsConfirm(String url, String message, JsResultReceiver receiver) {
         return false;
     }
 
     // Return true if the client will handle the JS prompt dialog.
     @CalledByNative
-    public boolean onJsPrompt(String url, String message, String defaultValue) {
+    public boolean onJsPrompt(String url, String message, String defaultValue,
+                              JsPromptResultReceiver receiver) {
         return false;
     }