Commit 614a3d26 authored by Maksim Ivanov's avatar Maksim Ivanov Committed by Commit Bot

Fix use-after-move in //content/browser/push_messaging/

Fix use-after-move (potential) bugs found by the
"bugprone-use-after-move" clang-tidy check.

Bug: 1122844
Change-Id: I0af5f12d7e856ec1f128cbe7d5fd08035de6fe72
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2383654
Commit-Queue: Peter Beverloo <peter@chromium.org>
Reviewed-by: default avatarPeter Beverloo <peter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803095}
parent 94206a6a
...@@ -463,10 +463,12 @@ void PushMessagingManager::Core::RegisterOnUI( ...@@ -463,10 +463,12 @@ void PushMessagingManager::Core::RegisterOnUI(
// Request notifications permission (which will fail, since // Request notifications permission (which will fail, since
// notifications aren't supported in incognito), so the website can't // notifications aren't supported in incognito), so the website can't
// detect whether incognito is active. // detect whether incognito is active.
GURL requesting_origin = data.requesting_origin;
bool user_gesture = data.user_gesture;
PermissionControllerImpl::FromBrowserContext(browser_context) PermissionControllerImpl::FromBrowserContext(browser_context)
->RequestPermission( ->RequestPermission(
PermissionType::NOTIFICATIONS, render_frame_host, PermissionType::NOTIFICATIONS, render_frame_host,
data.requesting_origin, data.user_gesture, requesting_origin, user_gesture,
base::BindOnce(&PushMessagingManager::Core:: base::BindOnce(&PushMessagingManager::Core::
DidRequestPermissionInIncognito, DidRequestPermissionInIncognito,
weak_factory_ui_to_ui_.GetWeakPtr(), weak_factory_ui_to_ui_.GetWeakPtr(),
...@@ -479,12 +481,13 @@ void PushMessagingManager::Core::RegisterOnUI( ...@@ -479,12 +481,13 @@ void PushMessagingManager::Core::RegisterOnUI(
int64_t registration_id = data.service_worker_registration_id; int64_t registration_id = data.service_worker_registration_id;
GURL requesting_origin = data.requesting_origin; GURL requesting_origin = data.requesting_origin;
bool user_gesture = data.user_gesture;
auto options = data.options->Clone(); auto options = data.options->Clone();
if (IsRequestFromDocument(render_frame_id_)) { if (IsRequestFromDocument(render_frame_id_)) {
push_service->SubscribeFromDocument( push_service->SubscribeFromDocument(
requesting_origin, registration_id, render_process_id_, requesting_origin, registration_id, render_process_id_,
render_frame_id_, std::move(options), data.user_gesture, render_frame_id_, std::move(options), user_gesture,
base::BindOnce(&Core::DidRegister, weak_factory_ui_to_ui_.GetWeakPtr(), base::BindOnce(&Core::DidRegister, weak_factory_ui_to_ui_.GetWeakPtr(),
std::move(data))); std::move(data)));
} else { } else {
......
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