Remove the ability of webpages to specify strings for the onbeforeunload dialog.

BUG=587940
TEST=as in bug
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation

Review URL: https://codereview.chromium.org/1714573002

Cr-Commit-Position: refs/heads/master@{#380755}

9 files changed, 9 insertions, 6 deletions

diff --git a/android_webview/DEPS b/android_webview/DEPS
index cd20d21..609c15c 100644
--- a/android_webview/DEPS
+++ b/android_webview/DEPS
@@ -14,6 +14,7 @@ include_rules = [
   "+content/public/common",
   "+crypto",
   "+gpu",
+  "+grit/components_strings.h",
   "+jni",
   "+net",
   "+skia",
diff --git a/android_webview/browser/aw_contents_client_bridge_base.h b/android_webview/browser/aw_contents_client_bridge_base.h
index 6ac592b..00598ba 100644
--- a/android_webview/browser/aw_contents_client_bridge_base.h
+++ b/android_webview/browser/aw_contents_client_bridge_base.h
@@ -59,7 +59,6 @@ class AwContentsClientBridgeBase {
 
   virtual void RunBeforeUnloadDialog(
       const GURL& origin_url,
-      const base::string16& message_text,
       const content::JavaScriptDialogManager::DialogClosedCallback& callback)
       = 0;
 
diff --git a/android_webview/browser/aw_javascript_dialog_manager.cc b/android_webview/browser/aw_javascript_dialog_manager.cc
index afe9bda..acc139e 100644
--- a/android_webview/browser/aw_javascript_dialog_manager.cc
+++ b/android_webview/browser/aw_javascript_dialog_manager.cc
@@ -39,7 +39,6 @@ void AwJavaScriptDialogManager::RunJavaScriptDialog(
 
 void AwJavaScriptDialogManager::RunBeforeUnloadDialog(
     content::WebContents* web_contents,
-    const base::string16& message_text,
     bool is_reload,
     const DialogClosedCallback& callback) {
   AwContentsClientBridgeBase* bridge =
@@ -50,7 +49,6 @@ void AwJavaScriptDialogManager::RunBeforeUnloadDialog(
   }
 
   bridge->RunBeforeUnloadDialog(web_contents->GetURL(),
-                                message_text,
                                 callback);
 }
 
diff --git a/android_webview/browser/aw_javascript_dialog_manager.h b/android_webview/browser/aw_javascript_dialog_manager.h
index e5b3815..9d0bf4a 100644
--- a/android_webview/browser/aw_javascript_dialog_manager.h
+++ b/android_webview/browser/aw_javascript_dialog_manager.h
@@ -25,7 +25,6 @@ class AwJavaScriptDialogManager : public content::JavaScriptDialogManager {
                            const DialogClosedCallback& callback,
                            bool* did_suppress_message) override;
   void RunBeforeUnloadDialog(content::WebContents* web_contents,
-                             const base::string16& message_text,
                              bool is_reload,
                              const DialogClosedCallback& callback) override;
   void CancelActiveAndPendingDialogs(
diff --git a/android_webview/native/BUILD.gn b/android_webview/native/BUILD.gn
index 6e09894..94c4613 100644
--- a/android_webview/native/BUILD.gn
+++ b/android_webview/native/BUILD.gn
@@ -14,6 +14,7 @@ source_set("native") {
     "//cc:cc",
     "//components/autofill/content/browser:browser",
     "//components/devtools_http_handler:devtools_http_handler",
+    "//components/strings",
     "//components/web_contents_delegate_android:web_contents_delegate_android",
     "//content/public/common",
     "//device/battery:mojo_bindings",
diff --git a/android_webview/native/aw_contents_client_bridge.cc b/android_webview/native/aw_contents_client_bridge.cc
index 4d2fd4dcb..d5b3b44 100644
--- a/android_webview/native/aw_contents_client_bridge.cc
+++ b/android_webview/native/aw_contents_client_bridge.cc
@@ -17,12 +17,14 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "crypto/scoped_openssl_types.h"
+#include "grit/components_strings.h"
 #include "jni/AwContentsClientBridge_jni.h"
 #include "net/android/keystore_openssl.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/openssl_client_key_store.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "net/ssl/ssl_client_cert_type.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 using base::android::AttachCurrentThread;
@@ -318,7 +320,6 @@ void AwContentsClientBridge::RunJavaScriptDialog(
 
 void AwContentsClientBridge::RunBeforeUnloadDialog(
     const GURL& origin_url,
-    const base::string16& message_text,
     const content::JavaScriptDialogManager::DialogClosedCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
@@ -329,6 +330,9 @@ void AwContentsClientBridge::RunBeforeUnloadDialog(
     return;
   }
 
+  const base::string16 message_text =
+      l10n_util::GetStringUTF16(IDS_BEFOREUNLOAD_MESSAGEBOX_MESSAGE);
+
   int callback_id = pending_js_dialog_callbacks_.Add(
       new content::JavaScriptDialogManager::DialogClosedCallback(callback));
   ScopedJavaLocalRef<jstring> jurl(
diff --git a/android_webview/native/aw_contents_client_bridge.h b/android_webview/native/aw_contents_client_bridge.h
index 2af63ca..d415dfa 100644
--- a/android_webview/native/aw_contents_client_bridge.h
+++ b/android_webview/native/aw_contents_client_bridge.h
@@ -51,7 +51,6 @@ class AwContentsClientBridge : public AwContentsClientBridgeBase {
       override;
   void RunBeforeUnloadDialog(
       const GURL& origin_url,
-      const base::string16& message_text,
       const content::JavaScriptDialogManager::DialogClosedCallback& callback)
       override;
   bool ShouldOverrideUrlLoading(const base::string16& url,
diff --git a/android_webview/native/webview_native.gyp b/android_webview/native/webview_native.gyp
index 0b57cae..14c371e 100644
--- a/android_webview/native/webview_native.gyp
+++ b/android_webview/native/webview_native.gyp
@@ -18,6 +18,7 @@
         '../../components/components.gyp:autofill_content_browser',
         '../../components/components.gyp:devtools_http_handler',
         '../../components/components.gyp:web_contents_delegate_android',
+        '../../components/components_strings.gyp:components_strings',
         '../../content/content.gyp:content_common',
         '../../media/media.gyp:player_android',
         '../../net/net.gyp:net',
diff --git a/android_webview/ui/grit_components_whitelist.txt b/android_webview/ui/grit_components_whitelist.txt
index f1739e8..84238b6 100644
--- a/android_webview/ui/grit_components_whitelist.txt
+++ b/android_webview/ui/grit_components_whitelist.txt
@@ -1,3 +1,4 @@
 IDS_POLICY_LIST_ENTRY_ERROR
 IDS_POLICY_SCHEMA_VALIDATION_ERROR
 IDS_POLICY_TYPE_ERROR
+IDS_BEFOREUNLOAD_MESSAGEBOX_MESSAGE