Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6408)

Unified Diff: chrome/browser/extensions/extension_service_test_base.cc

Issue 2863023002: Get rid of ExtensionServiceTestBase::ResetThreadBundle (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/extension_service_test_base.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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");
« no previous file with comments | « chrome/browser/extensions/extension_service_test_base.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698