diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-21 17:16:00 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-21 17:16:00 +0000 |
| commit | 146185df383870a8b4dba30061aa6a1118c58239 (patch) | |
| tree | f3d2ce8097c98f88f98a200b7102321c9df9a06c /remoting | |
| parent | cfeb7656524ced75c771017876429f5f1640ae81 (diff) | |
| download | chromium_src-146185df383870a8b4dba30061aa6a1118c58239.zip chromium_src-146185df383870a8b4dba30061aa6a1118c58239.tar.gz chromium_src-146185df383870a8b4dba30061aa6a1118c58239.tar.bz2 | |
Fix ThreadChecker to use Locks and not use scoped_ptr.
It needs to synchronize its checks, since in order to assert correctly, it needs to make sure the thread id is synchronized on all threads.
It doesn't need scoped_ptr. It was trying to use NULL to catch invalid thread ids. 0 is already assumed to be invalid (see base::Thread's use).
Eliminating scoped_ptr fixes a valgrind/heapcheck issue where they don't follow LazyInstance objects' member pointers. So they think the ThreadChecker's member variable is leaked, even though the global object still has a pointer to it.
Removing the scoped_ptr.h caused a bunch of other lame files to fail to compile. I had to fix those places. #include what you use please :(
TBR=levin (I want to green the memory bots)
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/5180006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66915 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/capturer_linux.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/remoting/host/capturer_linux.h b/remoting/host/capturer_linux.h index 6f854fc..8e8fcb3 100644 --- a/remoting/host/capturer_linux.h +++ b/remoting/host/capturer_linux.h @@ -5,6 +5,8 @@ #ifndef REMOTING_HOST_CAPTURER_LINUX_H_ #define REMOTING_HOST_CAPTURER_LINUX_H_ +#include "base/basictypes.h" +#include "base/scoped_ptr.h" #include "remoting/host/capturer.h" namespace remoting { |