Commit fd0b93ea authored by Hui Yingst's avatar Hui Yingst Committed by Chromium LUCI CQ

CodeHealthRotation: Migrate Bind to BindOnce/Repeating in extensions/renderer/wake_event_page*.

This CL migrates base::Bind to base::BindOnce/Repeating in
extensions/renderer/wake_event_page*, and migrates MakeRequestCallback
and OnResponseCall to base::OnceCallback/RepeatingCallback.

Bug: 1152265
Change-Id: I883f5dbcb050688bc45f85b96d0b6b8628f2cdef
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2573386
Commit-Queue: Hui Yingst <nigi@chromium.org>
Reviewed-by: default avatarDevlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835061}
parent da9f0473
...@@ -78,8 +78,9 @@ class WakeEventPage::WakeEventPageNativeHandler ...@@ -78,8 +78,9 @@ class WakeEventPage::WakeEventPageNativeHandler
make_request_.Run( make_request_.Run(
extension_id, extension_id,
base::Bind(&WakeEventPageNativeHandler::OnEventPageIsAwake, base::BindOnce(&WakeEventPageNativeHandler::OnEventPageIsAwake,
weak_ptr_factory_.GetWeakPtr(), base::Passed(&callback))); weak_ptr_factory_.GetWeakPtr(),
base::Passed(&callback)));
} }
void OnEventPageIsAwake(v8::Global<v8::Function> callback, bool success) { void OnEventPageIsAwake(v8::Global<v8::Function> callback, bool success) {
...@@ -132,9 +133,9 @@ v8::Local<v8::Function> WakeEventPage::GetForContext(ScriptContext* context) { ...@@ -132,9 +133,9 @@ v8::Local<v8::Function> WakeEventPage::GetForContext(ScriptContext* context) {
// Implement this using a NativeHandler, which requires a function name // Implement this using a NativeHandler, which requires a function name
// (arbitrary in this case). Handles own lifetime. // (arbitrary in this case). Handles own lifetime.
WakeEventPageNativeHandler* native_handler = new WakeEventPageNativeHandler( WakeEventPageNativeHandler* native_handler = new WakeEventPageNativeHandler(
context, base::Bind(&WakeEventPage::MakeRequest, context, base::BindRepeating(&WakeEventPage::MakeRequest,
// Safe, owned by a LazyInstance. // Safe, owned by a LazyInstance.
base::Unretained(this))); base::Unretained(this)));
native_handler->Initialize(); native_handler->Initialize();
// Extract and cache the wake-event-page function from the native handler. // Extract and cache the wake-event-page function from the native handler.
...@@ -150,8 +151,8 @@ v8::Local<v8::Function> WakeEventPage::GetForContext(ScriptContext* context) { ...@@ -150,8 +151,8 @@ v8::Local<v8::Function> WakeEventPage::GetForContext(ScriptContext* context) {
} }
WakeEventPage::RequestData::RequestData(int thread_id, WakeEventPage::RequestData::RequestData(int thread_id,
const OnResponseCallback& on_response) OnResponseCallback on_response)
: thread_id(thread_id), on_response(on_response) {} : thread_id(thread_id), on_response(std::move(on_response)) {}
WakeEventPage::RequestData::~RequestData() {} WakeEventPage::RequestData::~RequestData() {}
...@@ -160,13 +161,13 @@ WakeEventPage::WakeEventPage() {} ...@@ -160,13 +161,13 @@ WakeEventPage::WakeEventPage() {}
WakeEventPage::~WakeEventPage() {} WakeEventPage::~WakeEventPage() {}
void WakeEventPage::MakeRequest(const std::string& extension_id, void WakeEventPage::MakeRequest(const std::string& extension_id,
const OnResponseCallback& on_response) { OnResponseCallback on_response) {
static base::AtomicSequenceNumber sequence_number; static base::AtomicSequenceNumber sequence_number;
int request_id = sequence_number.GetNext(); int request_id = sequence_number.GetNext();
{ {
base::AutoLock lock(requests_lock_); base::AutoLock lock(requests_lock_);
requests_[request_id] = std::make_unique<RequestData>( requests_[request_id] = std::make_unique<RequestData>(
content::WorkerThread::GetCurrentId(), on_response); content::WorkerThread::GetCurrentId(), std::move(on_response));
} }
message_filter_->Send( message_filter_->Send(
new ExtensionHostMsg_WakeEventPage(request_id, extension_id)); new ExtensionHostMsg_WakeEventPage(request_id, extension_id));
...@@ -194,11 +195,11 @@ void WakeEventPage::OnWakeEventPageResponse(int request_id, bool success) { ...@@ -194,11 +195,11 @@ void WakeEventPage::OnWakeEventPageResponse(int request_id, bool success) {
if (request_data->thread_id == 0) { if (request_data->thread_id == 0) {
// Thread ID of 0 means it wasn't called on a worker thread, so safe to // Thread ID of 0 means it wasn't called on a worker thread, so safe to
// call immediately. // call immediately.
request_data->on_response.Run(success); std::move(request_data->on_response).Run(success);
} else { } else {
content::WorkerThread::PostTask( content::WorkerThread::PostTask(
request_data->thread_id, request_data->thread_id,
base::BindOnce(request_data->on_response, success)); base::BindOnce(std::move(request_data->on_response), success));
} }
} }
......
...@@ -63,16 +63,16 @@ class WakeEventPage : public content::RenderThreadObserver { ...@@ -63,16 +63,16 @@ class WakeEventPage : public content::RenderThreadObserver {
// The response from an ExtensionHostMsg_WakeEvent call, passed true if the // The response from an ExtensionHostMsg_WakeEvent call, passed true if the
// call was successful, false on failure. // call was successful, false on failure.
using OnResponseCallback = base::Callback<void(bool)>; using OnResponseCallback = base::OnceCallback<void(bool)>;
// Makes an ExtensionHostMsg_WakeEvent request for an extension ID. The // Makes an ExtensionHostMsg_WakeEvent request for an extension ID. The
// second argument is a callback to run when the request has completed. // second argument is a callback to run when the request has completed.
using MakeRequestCallback = using MakeRequestCallback =
base::Callback<void(const std::string&, const OnResponseCallback&)>; base::RepeatingCallback<void(const std::string&, OnResponseCallback)>;
// For |requests_|. // For |requests_|.
struct RequestData { struct RequestData {
RequestData(int thread_id, const OnResponseCallback& on_response); RequestData(int thread_id, OnResponseCallback on_response);
~RequestData(); ~RequestData();
// The thread ID the request was made on. |on_response| must be called on // The thread ID the request was made on. |on_response| must be called on
...@@ -84,13 +84,13 @@ class WakeEventPage : public content::RenderThreadObserver { ...@@ -84,13 +84,13 @@ class WakeEventPage : public content::RenderThreadObserver {
}; };
// Runs |on_response|, passing it |success|. // Runs |on_response|, passing it |success|.
static void RunOnResponseWithResult(const OnResponseCallback& on_response, static void RunOnResponseWithResult(OnResponseCallback on_response,
bool success); bool success);
// Sends the ExtensionHostMsg_WakeEvent IPC for |extension_id|, and // Sends the ExtensionHostMsg_WakeEvent IPC for |extension_id|, and
// updates |requests_| bookkeeping. // updates |requests_| bookkeeping.
void MakeRequest(const std::string& extension_id, void MakeRequest(const std::string& extension_id,
const OnResponseCallback& on_response); OnResponseCallback on_response);
// content::RenderThreadObserver: // content::RenderThreadObserver:
bool OnControlMessageReceived(const IPC::Message& message) override; bool OnControlMessageReceived(const IPC::Message& message) override;
......
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