summaryrefslogtreecommitdiffstats
path: root/remoting/host/screen_recorder.cc
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-26 20:18:40 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-26 20:18:40 +0000
commitd462298cf2a54318e0f1ad0126ed0b3cab952f4f (patch)
treea222a397c78cffbab3050b8d950ee65b9b305f66 /remoting/host/screen_recorder.cc
parentd931741758670a6310cdfc2a776f046e428e846b (diff)
downloadchromium_src-d462298cf2a54318e0f1ad0126ed0b3cab952f4f.zip
chromium_src-d462298cf2a54318e0f1ad0126ed0b3cab952f4f.tar.gz
chromium_src-d462298cf2a54318e0f1ad0126ed0b3cab952f4f.tar.bz2
Revert "Fix crashes in ChromotingHost"
Reverting the patch since it exposed several memory leaks and threading problems. TBR=thakis BUG=70935 TEST=None Review URL: http://codereview.chromium.org/6266023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72679 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/screen_recorder.cc')
-rw-r--r--remoting/host/screen_recorder.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/host/screen_recorder.cc b/remoting/host/screen_recorder.cc
index c154197..76ebcc8 100644
--- a/remoting/host/screen_recorder.cc
+++ b/remoting/host/screen_recorder.cc
@@ -102,8 +102,8 @@ void ScreenRecorder::RemoveAllConnections() {
Capturer* ScreenRecorder::capturer() {
DCHECK_EQ(capture_loop_, MessageLoop::current());
- DCHECK(capturer_);
- return capturer_;
+ DCHECK(capturer_.get());
+ return capturer_.get();
}
Encoder* ScreenRecorder::encoder() {