Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Unified Diff: base/process/process_fuchsia.cc

Issue 2941283002: fuchsia: Use new, qualified error names, disable old names. (Closed)
Patch Set: don have Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/process/launch_fuchsia.cc ('k') | base/process/process_handle_fuchsia.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/process/process_fuchsia.cc
diff --git a/base/process/process_fuchsia.cc b/base/process/process_fuchsia.cc
index 1f1d66146dc77fedaae0ee679a88ed4dc32dc511..910dd4bb8984034e5d7b1d6105d19adf1b6c194a 100644
--- a/base/process/process_fuchsia.cc
+++ b/base/process/process_fuchsia.cc
@@ -49,7 +49,7 @@ Process Process::Open(ProcessId pid) {
mx_handle_t handle;
mx_status_t status =
mx_object_get_child(mx_job_default(), pid, MX_RIGHT_SAME_RIGHTS, &handle);
- if (status != NO_ERROR) {
+ if (status != MX_OK) {
DLOG(ERROR) << "mx_object_get_child failed: " << status;
return Process();
}
@@ -66,7 +66,7 @@ Process Process::OpenWithExtraPrivileges(ProcessId pid) {
Process Process::DeprecatedGetProcessFromHandle(ProcessHandle handle) {
DCHECK_NE(handle, GetCurrentProcessHandle());
mx_handle_t out;
- if (mx_handle_duplicate(handle, MX_RIGHT_SAME_RIGHTS, &out) != NO_ERROR) {
+ if (mx_handle_duplicate(handle, MX_RIGHT_SAME_RIGHTS, &out) != MX_OK) {
DLOG(ERROR) << "mx_handle_duplicate failed: " << handle;
return Process();
}
@@ -100,7 +100,7 @@ Process Process::Duplicate() const {
return Process();
mx_handle_t out;
- if (mx_handle_duplicate(process_, MX_RIGHT_SAME_RIGHTS, &out) != NO_ERROR) {
+ if (mx_handle_duplicate(process_, MX_RIGHT_SAME_RIGHTS, &out) != MX_OK) {
DLOG(ERROR) << "mx_handle_duplicate failed: " << process_;
return Process();
}
@@ -121,7 +121,7 @@ void Process::Close() {
is_current_process_ = false;
if (IsValid()) {
mx_status_t status = mx_handle_close(process_);
- DCHECK_EQ(status, NO_ERROR);
+ DCHECK_EQ(status, MX_OK);
process_ = kNullProcessHandle;
}
}
@@ -129,16 +129,16 @@ void Process::Close() {
bool Process::Terminate(int exit_code, bool wait) const {
// exit_code isn't supportable.
mx_status_t status = mx_task_kill(process_);
- if (status == NO_ERROR && wait) {
+ if (status == MX_OK && wait) {
mx_signals_t signals;
status = mx_object_wait_one(process_, MX_TASK_TERMINATED,
mx_deadline_after(MX_SEC(60)), &signals);
- if (status != NO_ERROR) {
+ if (status != MX_OK) {
DLOG(ERROR) << "Error waiting for process exit: " << status;
} else {
DCHECK(signals & MX_TASK_TERMINATED);
}
- } else if (status != NO_ERROR) {
+ } else if (status != MX_OK) {
DLOG(ERROR) << "Unable to terminate process: " << status;
}
@@ -159,15 +159,15 @@ bool Process::WaitForExitWithTimeout(TimeDelta timeout, int* exit_code) const {
mx_status_t status = mx_object_wait_one(process_, MX_TASK_TERMINATED,
mxtimeout_nanos, &signals_observed);
*exit_code = -1;
- if (status != NO_ERROR && status != ERR_TIMED_OUT)
+ if (status != MX_OK && status != MX_ERR_TIMED_OUT)
return false;
- if (status == ERR_TIMED_OUT && !signals_observed)
+ if (status == MX_ERR_TIMED_OUT && !signals_observed)
return false;
mx_info_process_t proc_info;
status = mx_object_get_info(process_, MX_INFO_PROCESS, &proc_info,
sizeof(proc_info), nullptr, nullptr);
- if (status != NO_ERROR)
+ if (status != MX_OK)
return status;
*exit_code = proc_info.return_code;
« no previous file with comments | « base/process/launch_fuchsia.cc ('k') | base/process/process_handle_fuchsia.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698