Fix base::internal::WeakReferenceOwner races.

base/memory/weak_ptr_unittest.cc

 // Copyright (c) 2011 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 "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "base/message_loop.h"
+#include "base/task.h"
 #include "base/threading/thread.h"
 
 namespace base {
 namespace {
 
 template <class T>
 class OffThreadObjectCreator {
  public:
   static T* NewObject() {
     T* result;
@@ skipping 12 matching lines @@
     *result = new T;
   }
 };
 
 struct Base {};
 struct Derived : Base {};
 
 struct Producer : SupportsWeakPtr<Producer> {};
 struct Consumer { WeakPtr<Producer> producer; };
 
-}  // namespace
-
 TEST(WeakPtrTest, Basic) {
   int data;
   WeakPtrFactory<int> factory(&data);
   WeakPtr<int> ptr = factory.GetWeakPtr();
   EXPECT_EQ(&data, ptr.get());
 }
 
 TEST(WeakPtrTest, Comparison) {
   int data;
   WeakPtrFactory<int> factory(&data);
@@ skipping 74 matching lines @@
 TEST(WeakPtrTest, SingleThreaded2) {
   // Test that it is OK to create a class that has a WeakPtr member on one
   // thread, but use it on another.  This tests that we do not trip runtime
   // checks that ensure that a weak reference is not used by multiple threads.
   scoped_ptr<Consumer> consumer(OffThreadObjectCreator<Consumer>::NewObject());
   Producer producer;
   consumer->producer = producer.AsWeakPtr();
   EXPECT_EQ(&producer, consumer->producer.get());
 }
 
+TEST(WeakPtrTest, DeleteWeakPtrOnDifferentThread) {
+  Producer producer;
+  {
+    WeakPtr<Producer>* ptr = new WeakPtr<Producer>(producer.AsWeakPtr());
+    Thread thread("I delete WeakPtrs, w00t!");
+    thread.Start();
+    thread.message_loop()->PostTask(FROM_HERE,
+                                    new DeleteTask<WeakPtr<Producer> >(ptr));
+    // |thread| will be joined on destruction.
+  }
+  WeakPtr<Producer> weak_ptr = producer.AsWeakPtr();
+  EXPECT_TRUE(weak_ptr.get() != NULL);
+}
+
+}  // namespace
+
 }  // namespace base