refactor: remove deprecated AdaptCallbackForRepeating from App::AllowCertificateError()

ckerr · ckerr · commit d3c97a013697 · 2021-06-09T15:15:23.000-05:00
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2941842 is the commit that removes AdaptCallbackForRepeating Xref: 5853833 is the interim patch that restores AdaptCallbackForRepeating in Electron until all its uses can be removed.
diff --git a/shell/browser/api/electron_api_app.cc b/shell/browser/api/electron_api_app.cc
@@ -779,18 +779,19 @@ void App::AllowCertificateError(
     bool is_main_frame_request,
     bool strict_enforcement,
     base::OnceCallback<void(content::CertificateRequestResultType)> callback) {
-  auto adapted_callback = base::AdaptCallbackForRepeating(std::move(callback));
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
   v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
-  bool prevent_default =
-      Emit("certificate-error",
-           WebContents::FromOrCreate(isolate, web_contents), request_url,
-           net::ErrorToString(cert_error), ssl_info.cert, adapted_callback);
+  auto callback_pair = base::SplitOnceCallback(std::move(callback));
+  bool prevent_default = Emit("certificate-error",
+                              WebContents::FromOrCreate(isolate, web_contents),
+                              request_url, net::ErrorToString(cert_error),
+                              ssl_info.cert, std::move(callback_pair.first));
 
   // Deny the certificate by default.
   if (!prevent_default)
-    adapted_callback.Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY);
+    std::move(callback_pair.second)
+        .Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY);
 }
 
 base::OnceClosure App::SelectClientCertificate(
