Revert of Tests: Simplify SequencedWorkerPoolOwner, call Shutdown on destructor.

base/sequence_checker_unittest.cc

 // Copyright 2013 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/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
@@ skipping 45 matching lines @@
  public:
   SequenceCheckerTest() : other_thread_("sequence_checker_test_other_thread") {}
 
   void SetUp() override {
     other_thread_.Start();
     ResetPool();
   }
 
   void TearDown() override {
     other_thread_.Stop();
+    pool()->Shutdown();
   }
 
  protected:
   base::Thread* other_thread() { return &other_thread_; }
 
   const scoped_refptr<SequencedWorkerPool>& pool() {
     return pool_owner_->pool();
   }
 
   void PostDoStuffToWorkerPool(SequenceCheckedObject* sequence_checked_object,
@@ skipping 222 matching lines @@
   PostDoStuffToWorkerPool(sequence_checked_object.get(), "A");
   pool()->FlushForTesting();
 
   SequencedWorkerPoolOwner second_pool_owner(kNumWorkerThreads, "test2");
   second_pool_owner.pool()->PostNamedSequencedWorkerTask(
       "A",
       FROM_HERE,
       base::Bind(&SequenceCheckedObject::DoStuff,
                  base::Unretained(sequence_checked_object.get())));
   second_pool_owner.pool()->FlushForTesting();
+  second_pool_owner.pool()->Shutdown();
 }
 
 #if ENABLE_SEQUENCE_CHECKER
 TEST_F(SequenceCheckerTest, TwoDifferentWorkerPoolsDeathTestInDebug) {
   // The default style "fast" does not support multi-threaded tests.
   ::testing::FLAGS_gtest_death_test_style = "threadsafe";
   ASSERT_DEATH({
     TwoDifferentWorkerPoolsDeathTest();
   }, "");
 }
 #else
 TEST_F(SequenceCheckerTest, TwoDifferentWorkerPoolsDeathTestInRelease) {
   TwoDifferentWorkerPoolsDeathTest();
 }
 #endif  // ENABLE_SEQUENCE_CHECKER
 
 #endif  // GTEST_HAS_DEATH_TEST || !ENABLE_SEQUENCE_CHECKER
 
 }  // namespace
 
 }  // namespace base
 
 // Just in case we ever get lumped together with other compilation units.
 #undef ENABLE_SEQUENCE_CHECKER