diff options
| author | Ben Murdoch <benm@google.com> | 2011-01-07 14:18:56 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-01-11 10:23:13 +0000 |
| commit | 201ade2fbba22bfb27ae029f4d23fca6ded109a0 (patch) | |
| tree | b793f4ed916f73cf18357ea467ff3deb5ffb5b52 /base/simple_thread_unittest.cc | |
| parent | d8c4c37a7d0961944bfdfaa117d5c68c8e129c97 (diff) | |
| download | external_chromium-201ade2fbba22bfb27ae029f4d23fca6ded109a0.zip external_chromium-201ade2fbba22bfb27ae029f4d23fca6ded109a0.tar.gz external_chromium-201ade2fbba22bfb27ae029f4d23fca6ded109a0.tar.bz2 | |
Merge chromium at 9.0.597.55: Initial merge by git.
Change-Id: Id686a88437441ec7e17abb3328a404c7b6c3c6ad
Diffstat (limited to 'base/simple_thread_unittest.cc')
| -rw-r--r-- | base/simple_thread_unittest.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/base/simple_thread_unittest.cc b/base/simple_thread_unittest.cc index 85995c2..208290a 100644 --- a/base/simple_thread_unittest.cc +++ b/base/simple_thread_unittest.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include "base/atomic_sequence_num.h" -#include "base/lock.h" #include "base/simple_thread.h" #include "base/string_number_conversions.h" #include "base/waitable_event.h" |