diff options
| author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-30 02:16:47 +0000 |
|---|---|---|
| committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-30 02:16:47 +0000 |
| commit | 01e120b5eba85448d779b551168a10d5dc6e1090 (patch) | |
| tree | b8e86dbba8a22188c9ce3c932ff2a50cdd4e708d /remoting/host | |
| parent | 7d42ab581e053faa207a0e3a407374c9fee4f4d1 (diff) | |
| download | chromium_src-01e120b5eba85448d779b551168a10d5dc6e1090.zip chromium_src-01e120b5eba85448d779b551168a10d5dc6e1090.tar.gz chromium_src-01e120b5eba85448d779b551168a10d5dc6e1090.tar.bz2 | |
Making sure that IPC::ChannelProxy is destroyed on the same thread it has been created on.
TBR=wez@chromium.org
BUG=163091
TEST=remoting_unittests.DesktopProcessTest
Review URL: https://chromiumcodereview.appspot.com/11412254
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host')
| -rw-r--r-- | remoting/host/desktop_session_agent.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/remoting/host/desktop_session_agent.cc b/remoting/host/desktop_session_agent.cc index e490af1..5c028d0 100644 --- a/remoting/host/desktop_session_agent.cc +++ b/remoting/host/desktop_session_agent.cc @@ -17,6 +17,7 @@ namespace remoting { DesktopSessionAgent::~DesktopSessionAgent() { + DCHECK(!network_channel_); DCHECK(!video_capturer_); } @@ -141,6 +142,9 @@ bool DesktopSessionAgent::Start(const base::Closure& disconnected_task, void DesktopSessionAgent::Stop() { DCHECK(caller_task_runner()->BelongsToCurrentThread()); + // Make sure the channel is closed. + network_channel_.reset(); + // Stop the video capturer. video_capture_task_runner()->PostTask( FROM_HERE, base::Bind(&DesktopSessionAgent::StopVideoCapturer, this)); |