Commit 27a8bf78 authored by Cammie Smith Barnes's avatar Cammie Smith Barnes Committed by Chromium LUCI CQ

CodeHealth: Change base::Bind to Repeating in chrome/test/chromedriver.

This CL is part of the Code Health Rotation
(https://sites.google.com/corp/google.com/chrome-code-health/) and
changes the few remaining occurrences in chrome/test/chromedriver of
base::Bind, base::Callback, and base::Closure, to base::BindRepeating,
base::RepeatingCallback, and base::RepeatingClosure, respectively, to
match the surrounding code.

Bug: 1007643
Change-Id: I3070f02201bdc338b6b70ab8f3b8b40f5111a6c4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2622991
Commit-Queue: Cammie Smith Barnes <cammie@chromium.org>
Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#842319}
parent 5d47cded
...@@ -87,7 +87,7 @@ void ExecuteCreateSession(SessionThreadMap* session_thread_map, ...@@ -87,7 +87,7 @@ void ExecuteCreateSession(SessionThreadMap* session_thread_map,
namespace { namespace {
void OnGetSession(const base::WeakPtr<size_t>& session_remaining_count, void OnGetSession(const base::WeakPtr<size_t>& session_remaining_count,
const base::Closure& all_get_session_func, const base::RepeatingClosure& all_get_session_func,
base::ListValue* session_list, base::ListValue* session_list,
const Status& status, const Status& status,
std::unique_ptr<base::Value> value, std::unique_ptr<base::Value> value,
...@@ -144,7 +144,7 @@ void ExecuteGetSessions(const Command& session_capabilities_command, ...@@ -144,7 +144,7 @@ void ExecuteGetSessions(const Command& session_capabilities_command,
namespace { namespace {
void OnSessionQuit(const base::WeakPtr<size_t>& quit_remaining_count, void OnSessionQuit(const base::WeakPtr<size_t>& quit_remaining_count,
const base::Closure& all_quit_func, const base::RepeatingClosure& all_quit_func,
const Status& status, const Status& status,
std::unique_ptr<base::Value> value, std::unique_ptr<base::Value> value,
const std::string& session_id, const std::string& session_id,
...@@ -205,7 +205,7 @@ void ExecuteSessionCommandOnSessionThread( ...@@ -205,7 +205,7 @@ void ExecuteSessionCommandOnSessionThread(
std::unique_ptr<base::DictionaryValue> params, std::unique_ptr<base::DictionaryValue> params,
scoped_refptr<base::SingleThreadTaskRunner> cmd_task_runner, scoped_refptr<base::SingleThreadTaskRunner> cmd_task_runner,
const CommandCallback& callback_on_cmd, const CommandCallback& callback_on_cmd,
const base::Closure& terminate_on_cmd) { const base::RepeatingClosure& terminate_on_cmd) {
Session* session = GetThreadLocalSession(); Session* session = GetThreadLocalSession();
if (!session) { if (!session) {
......
...@@ -20,12 +20,12 @@ class Status; ...@@ -20,12 +20,12 @@ class Status;
class Timeout; class Timeout;
class WebView; class WebView;
typedef base::Callback<Status(Session* session, using ElementCommand =
WebView* web_view, base::RepeatingCallback<Status(Session* session,
const std::string&, WebView* web_view,
const base::DictionaryValue&, const std::string&,
std::unique_ptr<base::Value>*)> const base::DictionaryValue&,
ElementCommand; std::unique_ptr<base::Value>*)>;
// Execute a command on a specific element. // Execute a command on a specific element.
Status ExecuteElementCommand( Status ExecuteElementCommand(
......
...@@ -311,12 +311,14 @@ HttpHandler::HttpHandler( ...@@ -311,12 +311,14 @@ HttpHandler::HttpHandler(
kGet, "session/:sessionId/element/:id/enabled", kGet, "session/:sessionId/element/:id/enabled",
WrapToCommand("IsElementEnabled", WrapToCommand("IsElementEnabled",
base::BindRepeating(&ExecuteIsElementEnabled))), base::BindRepeating(&ExecuteIsElementEnabled))),
CommandMapping(kGet, "session/:sessionId/element/:id/computedlabel", CommandMapping(
WrapToCommand("GetComputedLabel", kGet, "session/:sessionId/element/:id/computedlabel",
base::Bind(&ExecuteGetComputedLabel))), WrapToCommand("GetComputedLabel",
CommandMapping(kGet, "session/:sessionId/element/:id/computedrole", base::BindRepeating(&ExecuteGetComputedLabel))),
WrapToCommand("GetComputedRole", CommandMapping(
base::Bind(&ExecuteGetComputedRole))), kGet, "session/:sessionId/element/:id/computedrole",
WrapToCommand("GetComputedRole",
base::BindRepeating(&ExecuteGetComputedRole))),
CommandMapping(kPost, "session/:sessionId/element/:id/click", CommandMapping(kPost, "session/:sessionId/element/:id/click",
WrapToCommand("ClickElement", WrapToCommand("ClickElement",
base::BindRepeating(&ExecuteClickElement))), base::BindRepeating(&ExecuteClickElement))),
...@@ -1014,16 +1016,17 @@ Command HttpHandler::WrapToCommand(const char* name, ...@@ -1014,16 +1016,17 @@ Command HttpHandler::WrapToCommand(const char* name,
Command HttpHandler::WrapToCommand(const char* name, Command HttpHandler::WrapToCommand(const char* name,
const WindowCommand& window_command, const WindowCommand& window_command,
bool w3c_standard_command) { bool w3c_standard_command) {
return WrapToCommand(name, base::Bind(&ExecuteWindowCommand, window_command), return WrapToCommand(
w3c_standard_command); name, base::BindRepeating(&ExecuteWindowCommand, window_command),
w3c_standard_command);
} }
Command HttpHandler::WrapToCommand(const char* name, Command HttpHandler::WrapToCommand(const char* name,
const ElementCommand& element_command, const ElementCommand& element_command,
bool w3c_standard_command) { bool w3c_standard_command) {
return WrapToCommand(name, return WrapToCommand(
base::Bind(&ExecuteElementCommand, element_command), name, base::BindRepeating(&ExecuteElementCommand, element_command),
w3c_standard_command); w3c_standard_command);
} }
void HttpHandler::HandleCommand( void HttpHandler::HandleCommand(
......
...@@ -22,12 +22,12 @@ class Status; ...@@ -22,12 +22,12 @@ class Status;
class Timeout; class Timeout;
class WebView; class WebView;
typedef base::Callback<Status(Session* session, using WindowCommand =
WebView* web_view, base::RepeatingCallback<Status(Session* session,
const base::DictionaryValue&, WebView* web_view,
std::unique_ptr<base::Value>*, const base::DictionaryValue&,
Timeout*)> std::unique_ptr<base::Value>*,
WindowCommand; Timeout*)>;
// Execute a Window Command on the target window. // Execute a Window Command on the target window.
Status ExecuteWindowCommand(const WindowCommand& command, Status ExecuteWindowCommand(const WindowCommand& command,
......
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