| Index: base/threading/simple_thread.h
|
| diff --git a/base/threading/simple_thread.h b/base/threading/simple_thread.h
|
| index f55bd62f251f3be98d24052b2d15a417aa365243..1631336d360b76645f1d379c12615d1bc00e6857 100644
|
| --- a/base/threading/simple_thread.h
|
| +++ b/base/threading/simple_thread.h
|
| @@ -46,8 +46,8 @@
|
| #include <vector>
|
|
|
| #include "base/basictypes.h"
|
| -#include "base/lock.h"
|
| #include "base/threading/platform_thread.h"
|
| +#include "base/synchronization/lock.h"
|
| #include "base/synchronization/waitable_event.h"
|
|
|
| namespace base {
|
| @@ -173,7 +173,7 @@ class DelegateSimpleThreadPool : public DelegateSimpleThread::Delegate {
|
| int num_threads_;
|
| std::vector<DelegateSimpleThread*> threads_;
|
| std::queue<Delegate*> delegates_;
|
| - Lock lock_; // Locks delegates_
|
| + base::Lock lock_; // Locks delegates_
|
| WaitableEvent dry_; // Not signaled when there is no work to do.
|
| };
|
|
|
|
|