Suppress erronous TSAN errors in new EDK.

mojo/edk/system/raw_channel.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/edk/system/raw_channel.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
 #include <algorithm>
@@ skipping 184 matching lines @@
   DCHECK(!delegate_);
   delegate_ = delegate;
 
   if (read_buffer_->num_valid_bytes_ ||
       !write_buffer_->message_queue_.IsEmpty()) {
     LazyInitialize();
   }
 }
 
 void RawChannel::EnsureLazyInitialized() {
-  if (!initialized_) {
-    internal::g_io_thread_task_runner->PostTask(
-        FROM_HERE,
-        base::Bind(&RawChannel::LockAndCallLazyInitialize,
-        weak_ptr_factory_.GetWeakPtr()));
+  {
+    base::AutoLock locker(write_lock_);
+    if (initialized_)
+      return;
   }
+
+  internal::g_io_thread_task_runner->PostTask(
+      FROM_HERE,
+      base::Bind(&RawChannel::LockAndCallLazyInitialize,
+      weak_ptr_factory_.GetWeakPtr()));
 }
 
 void RawChannel::LockAndCallLazyInitialize() {
   base::AutoLock read_locker(read_lock_);
   base::AutoLock locker(write_lock_);
   LazyInitialize();
 }
 
 void RawChannel::LazyInitialize() {
   read_lock_.AssertAcquired();
@@ skipping 58 matching lines @@
 
   // Normally, we want to flush any pending writes before shutting down. This
   // doesn't apply when 1) we don't have a handle (for obvious reasons),
   // 2) we have a read or write error before (doesn't matter which), or 3) when
   // there are no pending messages to be written.
   if (!IsHandleValid() || error_occurred_ || empty) {
     {
       base::AutoLock read_locker(read_lock_);
       base::AutoLock locker(write_lock_);
       OnShutdownNoLock(std::move(read_buffer_), std::move(write_buffer_));
+      if (initialized_)
+        base::MessageLoop::current()->RemoveDestructionObserver(this);
     }
 
-    if (initialized_) {
-      base::MessageLoop::current()->RemoveDestructionObserver(this);
-    }
     delete this;
     return;
   }
 
   base::AutoLock read_locker(read_lock_);
   base::AutoLock locker(write_lock_);
   DCHECK(read_buffer_->IsEmpty()) <<
       "RawChannel::Shutdown called but there is pending data to be read";
 
   write_stopped_ = true;
@@ skipping 417 matching lines @@
   OnReadCompletedNoLock(io_result, bytes_read);
 }
 
 void RawChannel::WillDestroyCurrentMessageLoop() {
   base::AutoLock locker(read_lock_);
   OnReadCompletedNoLock(IO_FAILED_SHUTDOWN, 0);
 }
 
 }  // namespace edk
 }  // namespace mojo