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

Unified Diff: chromeos/dbus/session_manager_client.cc

Issue 2291453006: chromeos: Fix potential crash in SessionManagerClient (Closed)
Patch Set: Created 4 years, 4 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/session_manager_client.cc
diff --git a/chromeos/dbus/session_manager_client.cc b/chromeos/dbus/session_manager_client.cc
index 7d64e53f358cc2ca92d4d49c0d6fe5f9dad69e80..c98a7c94ba0b54d2d5dcd005f64e0ff84b1b2e31 100644
--- a/chromeos/dbus/session_manager_client.cc
+++ b/chromeos/dbus/session_manager_client.cc
@@ -83,10 +83,6 @@ void CreateValidCredConduit(dbus::FileDescriptor* local_auth_fd,
remote_auth_fd->CheckValidity();
}
-void HandleDBusError(dbus::ErrorResponse* response) {
- LOG(ERROR) << "DBus error " << response->ToString();
achuithb 2016/08/30 08:56:28 Add a null check, but please log something if you
-}
-
} // namespace
// The SessionManagerClient implementation used in production.
@@ -512,12 +508,11 @@ class SessionManagerClientImpl : public SessionManagerClient {
// Ownership of local_auth_fd is passed to the callback that is to be
// called on completion of this method call. This keeps the browser end
// of the socket-pair alive for the duration of the RPC.
- session_manager_proxy_->CallMethodWithErrorCallback(
+ session_manager_proxy_->CallMethod(
&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
base::Bind(&SessionManagerClientImpl::OnRestartJob,
weak_ptr_factory_.GetWeakPtr(),
- base::Passed(&local_auth_fd)),
- base::Bind(HandleDBusError));
+ base::Passed(&local_auth_fd)));
}
// Called when kSessionManagerRestartJob method is complete.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698