Get rid of ExtensionServiceTestBase::ResetThreadBundle

chrome/browser/extensions/extension_service_test_base.cc

 // Copyright 2014 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 "chrome/browser/extensions/extension_service_test_base.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
@@ skipping 65 matching lines @@
     ExtensionServiceInitParams() {}
 
 ExtensionServiceTestBase::ExtensionServiceInitParams::
     ExtensionServiceInitParams(const ExtensionServiceInitParams& other) =
         default;
 
 ExtensionServiceTestBase::ExtensionServiceTestBase()
     : thread_bundle_(new content::TestBrowserThreadBundle(kThreadOptions)),
       service_(NULL),
       testing_local_state_(TestingBrowserProcess::GetGlobal()),
-      did_reset_thread_bundle_(false),
       registry_(NULL) {
   base::FilePath test_data_dir;
   if (!PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir)) {
     ADD_FAILURE();
     return;
   }
   data_dir_ = test_data_dir.AppendASCII("extensions");
 }
 
 ExtensionServiceTestBase::~ExtensionServiceTestBase() {
-  // Parts of destruction have to happen on an IO thread, so if the thread
-  // bundle is reset, we need to change it back.
-  if (did_reset_thread_bundle_)
-    ResetThreadBundle(kThreadOptions);
-
   // Why? Because |profile_| has to be destroyed before |at_exit_manager_|, but
   // is declared above it in the class definition since it's protected.
   profile_.reset();
 }
 
 ExtensionServiceTestBase::ExtensionServiceInitParams
 ExtensionServiceTestBase::CreateDefaultInitParams() {
   ExtensionServiceInitParams params;
   EXPECT_TRUE(temp_dir_.CreateUniqueTempDir());
   base::FilePath path = temp_dir_.GetPath();
@@ skipping 75 matching lines @@
   service_->updater()->Start();
 }
 
 void ExtensionServiceTestBase::
     InitializeExtensionServiceWithExtensionsDisabled() {
   ExtensionServiceInitParams params = CreateDefaultInitParams();
   params.extensions_enabled = false;
   InitializeExtensionService(params);
 }
 
-void ExtensionServiceTestBase::ResetThreadBundle(int options) {
-  did_reset_thread_bundle_ = true;
-  thread_bundle_.reset();
-  thread_bundle_.reset(new content::TestBrowserThreadBundle(options));
-}
-
 size_t ExtensionServiceTestBase::GetPrefKeyCount() {
   const base::DictionaryValue* dict =
       profile()->GetPrefs()->GetDictionary("extensions.settings");
   if (!dict) {
     ADD_FAILURE();
     return 0;
   }
   return dict->size();
 }
 
@@ skipping 122 matching lines @@
 
   service_->RegisterInstallGate(ExtensionPrefs::DELAY_REASON_WAIT_FOR_IMPORTS,
                                 service_->shared_module_service());
 
 #if defined(OS_CHROMEOS)
   InstallLimiter::Get(profile_.get())->DisableForTest();
 #endif
 }
 
 }  // namespace extensions