thread.cc race fix take 2

base/thread_unittest.cc

 // Copyright (c) 2006-2008 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/lock.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
@@ skipping 19 matching lines @@
  public:
   explicit SleepSome(int msec) : msec_(msec) {
   }
   virtual void Run() {
     PlatformThread::Sleep(msec_);
   }
  private:
   int msec_;
 };
 
+class SleepInsideInitThread : public Thread {
+ public:
+  SleepInsideInitThread() : Thread("none") { init_called_ = false; }
+  virtual ~SleepInsideInitThread() { }
+
+  virtual void Init() {
+    PlatformThread::Sleep(500);
+    init_called_ = true;
+  }
+  bool InitCalled() { return init_called_; }
+ private:
+  bool init_called_;
+};
+
 }  // namespace
 
 TEST_F(ThreadTest, Restart) {
   Thread a("Restart");
   a.Stop();
   EXPECT_FALSE(a.message_loop());
   EXPECT_TRUE(a.Start());
   EXPECT_TRUE(a.message_loop());
   a.Stop();
   EXPECT_FALSE(a.message_loop());
@@ skipping 50 matching lines @@
   a.StopSoon();
   a.Stop();
   EXPECT_FALSE(a.message_loop());
 }
 
 TEST_F(ThreadTest, ThreadName) {
   Thread a("ThreadName");
   EXPECT_TRUE(a.Start());
   EXPECT_EQ("ThreadName", a.thread_name());
 }
+
+// Make sure we can't use a thread between Start() and Init().
+TEST_F(ThreadTest, SleepInsideInit) {
+  SleepInsideInitThread t;
+  EXPECT_FALSE(t.InitCalled());
+  t.Start();
+  EXPECT_TRUE(t.InitCalled());
+}
+