Commit 59186520 authored by Nate Fischer's avatar Nate Fischer Committed by Commit Bot

AW: avoid std::unique_ptr in favor of make_unique

No change to logic, this just changes explicit calls to the
std::unique_ptr constructor to instead use make_unique() or implicit
conversion from nullptr. This is to conform with a chromium presubmit
check.

Test: ninja -C out/Default android_webview:common
Change-Id: If7ebeb1c67e9b5d07b13728cb3971b45491463ee
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1783702
Auto-Submit: Nate Fischer <ntfschr@chromium.org>
Reviewed-by: default avatarTao Bai <michaelbai@chromium.org>
Commit-Queue: Nate Fischer <ntfschr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#692924}
parent 2c6ac2df
...@@ -668,8 +668,8 @@ void AwContents::RequestProtectedMediaIdentifierPermission( ...@@ -668,8 +668,8 @@ void AwContents::RequestProtectedMediaIdentifierPermission(
const GURL& origin, const GURL& origin,
base::OnceCallback<void(bool)> callback) { base::OnceCallback<void(bool)> callback) {
permission_request_handler_->SendRequest( permission_request_handler_->SendRequest(
std::unique_ptr<AwPermissionRequestDelegate>(new SimplePermissionRequest( std::make_unique<SimplePermissionRequest>(
origin, AwPermissionRequest::ProtectedMediaId, std::move(callback)))); origin, AwPermissionRequest::ProtectedMediaId, std::move(callback)));
} }
void AwContents::CancelProtectedMediaIdentifierPermissionRequests( void AwContents::CancelProtectedMediaIdentifierPermissionRequests(
...@@ -691,8 +691,8 @@ void AwContents::RequestGeolocationPermission( ...@@ -691,8 +691,8 @@ void AwContents::RequestGeolocationPermission(
return; return;
} }
permission_request_handler_->SendRequest( permission_request_handler_->SendRequest(
std::unique_ptr<AwPermissionRequestDelegate>(new SimplePermissionRequest( std::make_unique<SimplePermissionRequest>(
origin, AwPermissionRequest::Geolocation, std::move(callback)))); origin, AwPermissionRequest::Geolocation, std::move(callback)));
} }
void AwContents::CancelGeolocationPermissionRequests(const GURL& origin) { void AwContents::CancelGeolocationPermissionRequests(const GURL& origin) {
...@@ -713,8 +713,8 @@ void AwContents::RequestMIDISysexPermission( ...@@ -713,8 +713,8 @@ void AwContents::RequestMIDISysexPermission(
const GURL& origin, const GURL& origin,
base::OnceCallback<void(bool)> callback) { base::OnceCallback<void(bool)> callback) {
permission_request_handler_->SendRequest( permission_request_handler_->SendRequest(
std::unique_ptr<AwPermissionRequestDelegate>(new SimplePermissionRequest( std::make_unique<SimplePermissionRequest>(
origin, AwPermissionRequest::MIDISysex, std::move(callback)))); origin, AwPermissionRequest::MIDISysex, std::move(callback)));
} }
void AwContents::CancelMIDISysexPermissionRequests(const GURL& origin) { void AwContents::CancelMIDISysexPermissionRequests(const GURL& origin) {
......
...@@ -49,7 +49,7 @@ class UnixDomainServerSocketFactory : public content::DevToolsSocketFactory { ...@@ -49,7 +49,7 @@ class UnixDomainServerSocketFactory : public content::DevToolsSocketFactory {
base::BindRepeating(&content::CanUserConnectToDevTools), base::BindRepeating(&content::CanUserConnectToDevTools),
true /* use_abstract_namespace */)); true /* use_abstract_namespace */));
if (socket->BindAndListen(socket_name_, kBackLog) != net::OK) if (socket->BindAndListen(socket_name_, kBackLog) != net::OK)
return std::unique_ptr<net::ServerSocket>(); return nullptr;
return std::move(socket); return std::move(socket);
} }
...@@ -63,7 +63,7 @@ class UnixDomainServerSocketFactory : public content::DevToolsSocketFactory { ...@@ -63,7 +63,7 @@ class UnixDomainServerSocketFactory : public content::DevToolsSocketFactory {
base::BindRepeating(&content::CanUserConnectToDevTools), base::BindRepeating(&content::CanUserConnectToDevTools),
true /* use_abstract_namespace */)); true /* use_abstract_namespace */));
if (socket->BindAndListen(*name, kBackLog) != net::OK) if (socket->BindAndListen(*name, kBackLog) != net::OK)
return std::unique_ptr<net::ServerSocket>(); return nullptr;
return std::move(socket); return std::move(socket);
} }
......
...@@ -278,12 +278,12 @@ void AwWebContentsDelegate::RequestMediaAccessPermission( ...@@ -278,12 +278,12 @@ void AwWebContentsDelegate::RequestMediaAccessPermission(
std::move(callback).Run( std::move(callback).Run(
blink::MediaStreamDevices(), blink::MediaStreamDevices(),
blink::mojom::MediaStreamRequestResult::FAILED_DUE_TO_SHUTDOWN, blink::mojom::MediaStreamRequestResult::FAILED_DUE_TO_SHUTDOWN,
std::unique_ptr<content::MediaStreamUI>()); nullptr);
return; return;
} }
aw_contents->GetPermissionRequestHandler()->SendRequest( aw_contents->GetPermissionRequestHandler()->SendRequest(
std::unique_ptr<AwPermissionRequestDelegate>( std::make_unique<MediaAccessPermissionRequest>(request,
new MediaAccessPermissionRequest(request, std::move(callback)))); std::move(callback)));
} }
void AwWebContentsDelegate::EnterFullscreenModeForTab( void AwWebContentsDelegate::EnterFullscreenModeForTab(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment