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

ui/app_list/search/history_data_store_unittest.cc

Index: ui/app_list/search/history_data_store_unittest.cc
diff --git a/ui/app_list/search/history_data_store_unittest.cc b/ui/app_list/search/history_data_store_unittest.cc
index 6af4dc02b7ac8bd3c13b349e2d8936afc4b675c3..26890f46619f1eb7c2c81968b10dfc2247bcb523 100644
--- a/ui/app_list/search/history_data_store_unittest.cc
+++ b/ui/app_list/search/history_data_store_unittest.cc
@@ -9,7 +9,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "base/test/sequenced_worker_pool_owner.h"
+#include "base/threading/sequenced_worker_pool.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/app_list/search/dictionary_data_store.h"
 #include "ui/app_list/search/history_data.h"
@@ -41,10 +41,12 @@
 
 class HistoryDataStoreTest : public testing::Test {
  public:
-  HistoryDataStoreTest() : worker_pool_owner_(1, "AppLanucherTest") {}
+  HistoryDataStoreTest() {}
+  ~HistoryDataStoreTest() override {}
 
   // testing::Test overrides:
   void SetUp() override {
+    worker_pool_ = new base::SequencedWorkerPool(1, "AppLauncherTest");
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
   }
   void TearDown() override {
@@ -55,7 +57,7 @@
   void OpenStore(const std::string& file_name) {
     data_file_ = temp_dir_.path().AppendASCII(file_name);
     store_ = new HistoryDataStore(scoped_refptr<DictionaryDataStore>(
-        new DictionaryDataStore(data_file_, worker_pool_owner_.pool().get())));
+        new DictionaryDataStore(data_file_, worker_pool_.get())));
     Load();
   }
 
@@ -93,7 +95,7 @@
   base::ScopedTempDir temp_dir_;
   base::FilePath data_file_;
   scoped_ptr<base::RunLoop> run_loop_;
-  base::SequencedWorkerPoolOwner worker_pool_owner_;
+  scoped_refptr<base::SequencedWorkerPool> worker_pool_;
 
   scoped_refptr<HistoryDataStore> store_;
   HistoryData::Associations associations_;