Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode.

android_webview/native/aw_contents_client_bridge.cc

Index: android_webview/native/aw_contents_client_bridge.cc
diff --git a/android_webview/native/aw_contents_client_bridge.cc b/android_webview/native/aw_contents_client_bridge.cc
index 41a7c1561e7c8d010c6e64c42093f8956942974d..a89e969f9af5a46e3863b5f3b5517c72b5041671 100644
--- a/android_webview/native/aw_contents_client_bridge.cc
+++ b/android_webview/native/aw_contents_client_bridge.cc
@@ -4,6 +4,7 @@
 
 #include "android_webview/native/aw_contents_client_bridge.h"
 
+#include <memory>
 #include <utility>
 
 #include "android_webview/common/devtools_instrumentation.h"
@@ -102,7 +103,7 @@ void AwContentsClientBridge::AllowCertificateError(
   // We need to add the callback before making the call to java side,
   // as it may do a synchronous callback prior to returning.
   int request_id = pending_cert_error_callbacks_.Add(
-      new CertErrorCallback(callback));
+      base::MakeUnique<CertErrorCallback>(callback));
   *cancel_request = !Java_AwContentsClientBridge_allowCertificateError(
       env, obj, cert_error, jcert, jurl, request_id);
   // if the request is cancelled, then cancel the stored callback
@@ -280,7 +281,8 @@ void AwContentsClientBridge::RunJavaScriptDialog(
   }
 
   int callback_id = pending_js_dialog_callbacks_.Add(
-      new content::JavaScriptDialogManager::DialogClosedCallback(callback));
+      base::MakeUnique<content::JavaScriptDialogManager::DialogClosedCallback>(
+          callback));
   ScopedJavaLocalRef<jstring> jurl(
       ConvertUTF8ToJavaString(env, origin_url.spec()));
   ScopedJavaLocalRef<jstring> jmessage(
@@ -328,7 +330,8 @@ void AwContentsClientBridge::RunBeforeUnloadDialog(
       l10n_util::GetStringUTF16(IDS_BEFOREUNLOAD_MESSAGEBOX_MESSAGE);
 
   int callback_id = pending_js_dialog_callbacks_.Add(
-      new content::JavaScriptDialogManager::DialogClosedCallback(callback));
+      base::MakeUnique<content::JavaScriptDialogManager::DialogClosedCallback>(
+          callback));
   ScopedJavaLocalRef<jstring> jurl(
       ConvertUTF8ToJavaString(env, origin_url.spec()));
   ScopedJavaLocalRef<jstring> jmessage(