Partial Reland of Make the default ctor of rtc::Thread, protected

webrtc/rtc_base/thread_checker_unittest.cc

 /*
  *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 // Borrowed from Chromium's src/base/threading/thread_checker_unittest.cc.
 
 #include <memory>
 
 #include "webrtc/rtc_base/checks.h"
 #include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/nullsocketserver.h"
 #include "webrtc/rtc_base/task_queue.h"
 #include "webrtc/rtc_base/thread.h"
 #include "webrtc/rtc_base/thread_checker.h"
 #include "webrtc/test/gtest.h"
 
 // Duplicated from base/threading/thread_checker.h so that we can be
 // good citizens there and undef the macro.
 #define ENABLE_THREAD_CHECKER RTC_DCHECK_IS_ON
 
 namespace rtc {
@@ skipping 18 matching lines @@
   static void DetachThenCallFromDifferentThreadImpl();
 
  private:
   RTC_DISALLOW_COPY_AND_ASSIGN(ThreadCheckerClass);
 };
 
 // Calls ThreadCheckerClass::DoStuff on another thread.
 class CallDoStuffOnThread : public Thread {
  public:
   explicit CallDoStuffOnThread(ThreadCheckerClass* thread_checker_class)
-      : Thread(),
+      : Thread(std::unique_ptr<SocketServer>(new rtc::NullSocketServer())),
         thread_checker_class_(thread_checker_class) {
     SetName("call_do_stuff_on_thread", nullptr);
   }
 
   void Run() override { thread_checker_class_->DoStuff(); }
 
   // New method. Needed since Thread::Join is protected, and it is called by
   // the TEST.
   void Join() {
     Thread::Join();
   }
 
  private:
   ThreadCheckerClass* thread_checker_class_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(CallDoStuffOnThread);
 };
 
 // Deletes ThreadCheckerClass on a different thread.
 class DeleteThreadCheckerClassOnThread : public Thread {
  public:
   explicit DeleteThreadCheckerClassOnThread(
-      ThreadCheckerClass* thread_checker_class)
-      : Thread(),
-        thread_checker_class_(thread_checker_class) {
+      std::unique_ptr<ThreadCheckerClass> thread_checker_class)
+      : Thread(std::unique_ptr<SocketServer>(new rtc::NullSocketServer())),
+        thread_checker_class_(std::move(thread_checker_class)) {
     SetName("delete_thread_checker_class_on_thread", nullptr);
   }
 
   void Run() override { thread_checker_class_.reset(); }
 
   // New method. Needed since Thread::Join is protected, and it is called by
   // the TEST.
   void Join() {
     Thread::Join();
   }
 
+  bool has_been_deleted() const { return !thread_checker_class_; }
+
  private:
   std::unique_ptr<ThreadCheckerClass> thread_checker_class_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(DeleteThreadCheckerClassOnThread);
 };
 
 }  // namespace
 
 TEST(ThreadCheckerTest, CallsAllowedOnSameThread) {
   std::unique_ptr<ThreadCheckerClass> thread_checker_class(
       new ThreadCheckerClass);
 
   // Verify that DoStuff doesn't assert.
   thread_checker_class->DoStuff();
 
   // Verify that the destructor doesn't assert.
   thread_checker_class.reset();
 }
 
 TEST(ThreadCheckerTest, DestructorAllowedOnDifferentThread) {
   std::unique_ptr<ThreadCheckerClass> thread_checker_class(
       new ThreadCheckerClass);
 
   // Verify that the destructor doesn't assert
   // when called on a different thread.
   DeleteThreadCheckerClassOnThread delete_on_thread(
-      thread_checker_class.release());
+      std::move(thread_checker_class));
+
+  EXPECT_FALSE(delete_on_thread.has_been_deleted());
 
   delete_on_thread.Start();
   delete_on_thread.Join();
+
+  EXPECT_TRUE(delete_on_thread.has_been_deleted());
 }
 
 TEST(ThreadCheckerTest, DetachFromThread) {
   std::unique_ptr<ThreadCheckerClass> thread_checker_class(
       new ThreadCheckerClass);
 
   // Verify that DoStuff doesn't assert when called on a different thread after
   // a call to DetachFromThread.
   thread_checker_class->DetachFromThread();
   CallDoStuffOnThread call_on_thread(thread_checker_class.get());
@@ skipping 111 matching lines @@
 
   int var_thread_ ACCESS_ON(thread_);
   int var_checker_ GUARDED_BY(checker_);
   int var_queue_ ACCESS_ON(queue_);
 };
 
 // Just in case we ever get lumped together with other compilation units.
 #undef ENABLE_THREAD_CHECKER
 
 }  // namespace rtc