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

content/browser/net/quota_policy_cookie_store_unittest.cc

 // Copyright 2015 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/bind.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
@@ skipping 91 matching lines @@
             false, false, false, net::COOKIE_PRIORITY_DEFAULT));
   }
 
   void DestroyStore() {
     store_ = nullptr;
     // Ensure that |store_|'s destructor has run by shutting down the pool and
     // then forcing the pool to be destructed. This will ensure that all the
     // tasks that block pool shutdown (e.g. |store_|'s cleanup) have run before
     // yielding control.
     pool_owner_->pool()->FlushForTesting();
+    pool_owner_->pool()->Shutdown();
     pool_owner_.reset(new base::SequencedWorkerPoolOwner(3, "Background Pool"));
   }
 
   void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
   }
 
   void TearDown() override {
     DestroyStore();
+    pool_owner_->pool()->Shutdown();
   }
 
   TestBrowserThreadBundle bundle_;
   scoped_ptr<base::SequencedWorkerPoolOwner> pool_owner_;
   base::WaitableEvent loaded_event_;
   base::WaitableEvent destroy_event_;
   base::ScopedTempDir temp_dir_;
   scoped_refptr<QuotaPolicyCookieStore> store_;
   CanonicalCookieVector cookies_;
 };
@@ skipping 149 matching lines @@
   // Reload and test for persistence.
   STLDeleteElements(&cookies);
   CreateAndLoad(storage_policy.get(), &cookies);
   EXPECT_EQ(0U, cookies.size());
 
   STLDeleteElements(&cookies);
 }
 
 }  // namespace
 }  // namespace content