Revert of Do not block in SimpleThread::Start().

base/threading/simple_thread_unittest.cc

 // Copyright (c) 2012 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 <memory>
 
 #include "base/atomic_sequence_num.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 111 matching lines @@
 
 }  // namespace
 
 TEST(SimpleThreadTest, CreateAndJoin) {
   int stack_int = 0;
 
   SetIntRunner runner(&stack_int, 7);
   EXPECT_EQ(0, stack_int);
 
   DelegateSimpleThread thread(&runner, "int_setter");
+  EXPECT_FALSE(thread.HasBeenStarted());
+  EXPECT_FALSE(thread.HasBeenJoined());
   EXPECT_EQ(0, stack_int);
 
   thread.Start();
+  EXPECT_TRUE(thread.HasBeenStarted());
+  EXPECT_FALSE(thread.HasBeenJoined());
+
   thread.Join();
-
+  EXPECT_TRUE(thread.HasBeenStarted());
+  EXPECT_TRUE(thread.HasBeenJoined());
   EXPECT_EQ(7, stack_int);
 }
 
 TEST(SimpleThreadTest, WaitForEvent) {
   // Create a thread, and wait for it to signal us.
   WaitableEvent event(WaitableEvent::ResetPolicy::MANUAL,
                       WaitableEvent::InitialState::NOT_SIGNALED);
 
   WaitEventRunner runner(&event);
   DelegateSimpleThread thread(&runner, "event_waiter");
 
   EXPECT_FALSE(event.IsSignaled());
   thread.Start();
   event.Wait();
   EXPECT_TRUE(event.IsSignaled());
   thread.Join();
 }
 
 TEST(SimpleThreadTest, NonJoinableStartAndDieOnJoin) {
   ControlledRunner runner;
 
   SimpleThread::Options options;
   options.joinable = false;
   DelegateSimpleThread thread(&runner, "non_joinable", options);
 
+  EXPECT_FALSE(thread.HasBeenStarted());
   thread.Start();
+  EXPECT_TRUE(thread.HasBeenStarted());
 
-  // Wait until Run() is invoked.
+  // Note: this is not quite the same as |thread.HasBeenStarted()| which
+  // represents ThreadMain() getting ready to invoke Run() whereas
+  // |runner.WaitUntilStarted()| ensures Run() was actually invoked.
   runner.WaitUntilStarted();
 
+  EXPECT_FALSE(thread.HasBeenJoined());
   EXPECT_DCHECK_DEATH({ thread.Join(); });
 }
 
 TEST(SimpleThreadTest, NonJoinableInactiveDelegateDestructionIsOkay) {
   std::unique_ptr<ControlledRunner> runner(new ControlledRunner);
 
   SimpleThread::Options options;
   options.joinable = false;
   std::unique_ptr<DelegateSimpleThread> thread(
       new DelegateSimpleThread(runner.get(), "non_joinable", options));
@@ skipping 37 matching lines @@
   VerifyPoolRunner verifier(&seq2, 9, &event);
   pool.Start();
 
   pool.AddWork(&verifier, 10);
 
   pool.JoinAll();
   EXPECT_EQ(seq2.GetNext(), 10);
 }
 
 }  // namespace base