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

Unified Diff: remoting/host/desktop_process.cc

Issue 12302042: Add more IPC unit tests: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix DesktopProcess shutdown. Test IpcDesktopEnvironmentFactory too." Created 7 years, 10 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 | remoting/host/desktop_session_connector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/desktop_process.cc
diff --git a/remoting/host/desktop_process.cc b/remoting/host/desktop_process.cc
index 2785a29688604b59f12c3db4fdfa1630da06586f..a994e2207dce8d50d82b79a41a75275acdc03e09 100644
--- a/remoting/host/desktop_process.cc
+++ b/remoting/host/desktop_process.cc
@@ -71,12 +71,13 @@ void DesktopProcess::OnChannelConnected(int32 peer_pid) {
}
void DesktopProcess::OnChannelError() {
- DCHECK(caller_task_runner_->BelongsToCurrentThread());
-
// Shutdown the desktop process.
daemon_channel_.reset();
- desktop_agent_->Stop();
- desktop_agent_ = NULL;
+ if (desktop_agent_) {
+ desktop_agent_->Stop();
+ desktop_agent_ = NULL;
+ }
+
caller_task_runner_ = NULL;
}
« no previous file with comments | « no previous file | remoting/host/desktop_session_connector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698