Add joinable option to SimpleThread::Options as was just done for Thread.

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/strings/string_number_conversions.h"
 #include "base/synchronization/waitable_event.h"
+#include "base/test/gtest_util.h"
+#include "base/threading/platform_thread.h"
 #include "base/threading/simple_thread.h"
+#include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 
 namespace {
 
+// Sleeps a tiny amount to augment chances of tests using it running in races
+// should there be any while the tested thread is alive.
+class SleepRunner : public DelegateSimpleThread::Delegate {
+  void Run() override {
+    PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(20));

[Lei Zhang, 2016/08/03 23:24:12]

no need for base:: inside base.

[gab, 2016/08/04 14:35:01]

Done.

+  }
+};
+
 class SetIntRunner : public DelegateSimpleThread::Delegate {
  public:
   SetIntRunner(int* ptr, int val) : ptr_(ptr), val_(val) { }
   ~SetIntRunner() override {}
 
   void Run() override { *ptr_ = val_; }
 
  private:
   int* ptr_;
   int val_;
@@ skipping 101 matching lines @@
 
   EXPECT_TRUE(event.IsSignaled());
   thread.Join();
 
   // We keep the name and tid, even after the thread is gone.
   EXPECT_EQ(thread.name_prefix(), "event_waiter");
   EXPECT_EQ(thread.name(),
             std::string("event_waiter/") + IntToString(thread.tid()));
 }
 
+TEST(SimpleThreadTest, JoinNonJoinableThreadDeath) {
+  SleepRunner runner;
+  SimpleThread::Options options;
+  options.joinable = false;
+  DelegateSimpleThread thread(&runner, "noop_runner", options);
+
+  thread.Start();
+  EXPECT_DCHECK_DEATH(thread.Join(), "");
+}
+
+TEST(SimpleThreadTest, DeleteNonJoinableWithoutJoinIsSafe) {
+  SleepRunner runner;
+  SimpleThread::Options options;
+  options.joinable = false;
+  DelegateSimpleThread thread(&runner, "noop_runner", options);
+  thread.Start();
+  // Nothing blows up when |thread| goes out of scope.
+}
+
 TEST(SimpleThreadTest, ThreadPool) {
   AtomicSequenceNumber seq;
   SeqRunner runner(&seq);
   DelegateSimpleThreadPool pool("seq_runner", 10);
 
   // Add work before we're running.
   pool.AddWork(&runner, 300);
 
   EXPECT_EQ(seq.GetNext(), 0);
   pool.Start();
@@ skipping 14 matching lines @@
   VerifyPoolRunner verifier(&seq2, 9, &event);
   pool.Start();
 
   pool.AddWork(&verifier, 10);
 
   pool.JoinAll();
   EXPECT_EQ(seq2.GetNext(), 10);
 }
 
 }  // namespace base