| Index: chrome/browser/extensions/extension_service_test_base.cc
|
| diff --git a/chrome/browser/extensions/extension_service_test_base.cc b/chrome/browser/extensions/extension_service_test_base.cc
|
| index e82c03b8a5b649dd54e0c8bc88b55f83aac15ad1..9b7f670d6777a5e43b64d885e5377fc48afed203 100644
|
| --- a/chrome/browser/extensions/extension_service_test_base.cc
|
| +++ b/chrome/browser/extensions/extension_service_test_base.cc
|
| @@ -83,7 +83,6 @@ 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)) {
|
| @@ -94,11 +93,6 @@ ExtensionServiceTestBase::ExtensionServiceTestBase()
|
| }
|
|
|
| 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();
|
| @@ -194,12 +188,6 @@ void ExtensionServiceTestBase::
|
| 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");
|
|
|