| Index: remoting/base/auto_thread.cc
|
| diff --git a/remoting/base/auto_thread.cc b/remoting/base/auto_thread.cc
|
| index d79af49faa6976fdd14eb4bbb903e6176af5cc6e..9890bc39ecaaa8bff1981880218a55de2337e70b 100644
|
| --- a/remoting/base/auto_thread.cc
|
| +++ b/remoting/base/auto_thread.cc
|
| @@ -92,7 +92,7 @@ AutoThread::AutoThread(const char* name)
|
| #if defined(OS_WIN)
|
| com_init_type_(COM_INIT_NONE),
|
| #endif
|
| - thread_(0),
|
| + thread_(),
|
| name_(name),
|
| was_quit_properly_(false) {
|
| }
|
| @@ -102,7 +102,7 @@ AutoThread::AutoThread(const char* name, AutoThreadTaskRunner* joiner)
|
| #if defined(OS_WIN)
|
| com_init_type_(COM_INIT_NONE),
|
| #endif
|
| - thread_(0),
|
| + thread_(),
|
| name_(name),
|
| was_quit_properly_(false),
|
| joiner_(joiner) {
|
| @@ -112,14 +112,14 @@ AutoThread::~AutoThread() {
|
| DCHECK(!startup_data_);
|
|
|
| // Wait for the thread to exit.
|
| - if (thread_) {
|
| + if (!thread_.is_null()) {
|
| base::PlatformThread::Join(thread_);
|
| }
|
| }
|
|
|
| scoped_refptr<AutoThreadTaskRunner> AutoThread::StartWithType(
|
| base::MessageLoop::Type type) {
|
| - DCHECK(!thread_);
|
| + DCHECK(thread_.is_null());
|
| #if defined(OS_WIN)
|
| DCHECK(com_init_type_ != COM_INIT_STA || type == base::MessageLoop::TYPE_UI);
|
| #endif
|
|
|