Upstream chromium side of modal dialogs for webview.

content/browser/android/content_view_client.h

Index: content/browser/android/content_view_client.h
diff --git a/content/browser/android/content_view_client.h b/content/browser/android/content_view_client.h
index e90ef29125d6c051f028a15f11ae9af7829ad05d..b28915e710f6d0f27b9913f6b060f62a8d3dc6b3 100644
--- a/content/browser/android/content_view_client.h
+++ b/content/browser/android/content_view_client.h
@@ -8,7 +8,6 @@
 #include "base/android/jni_helper.h"
 #include "base/compiler_specific.h"
 #include "content/public/browser/native_web_keyboard_event.h"
-#include "content/public/common/javascript_message_type.h"
 #include "content/public/common/referrer.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_errors.h"
@@ -84,15 +83,6 @@ class ContentViewClient {
   void OnInterstitialShown();
   void OnInterstitialHidden();
 
-  void SetJavaScriptDialogCreator(
-      JavaScriptDialogCreator* javascript_dialog_creator);
-
-  bool OnJSModalDialog(JavaScriptMessageType type,
-                       bool is_before_unload_dialog,
-                       const GURL& url,
-                       const string16& message,
-                       const string16& default_value);
-
  private:
   // Get the closest ContentViewClient match to the given Chrome error code.
   static ContentViewClientError ToContentViewClientError(int net_error);