summaryrefslogtreecommitdiffstats
path: root/mojo/service_manager
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-13 21:35:36 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-13 21:35:36 +0000
commitfdaf9d1bed089dfafdae4d623d78e49aacff1e24 (patch)
tree9640684ade9f48be4ca5583eb3efdedee6fb4994 /mojo/service_manager
parent9a79ccb05c24ab74a1e426d5b06361b9623dfc3c (diff)
downloadchromium_src-fdaf9d1bed089dfafdae4d623d78e49aacff1e24.zip
chromium_src-fdaf9d1bed089dfafdae4d623d78e49aacff1e24.tar.gz
chromium_src-fdaf9d1bed089dfafdae4d623d78e49aacff1e24.tar.bz2
Makes BackgroundServiceLoader destroy loader on background thread
As the loader is used on the background thread it should also be destroyed on the background thread. This way all usage is kept to a single thread so that if the loader uses resources that require access on the same thread we don't run into issues. BUG=372585 TEST=covered by tests R=davemoore@chromium.org Review URL: https://codereview.chromium.org/276573013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270212 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/service_manager')
-rw-r--r--mojo/service_manager/background_service_loader.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/mojo/service_manager/background_service_loader.cc b/mojo/service_manager/background_service_loader.cc
index d4dcd4a..e780767 100644
--- a/mojo/service_manager/background_service_loader.cc
+++ b/mojo/service_manager/background_service_loader.cc
@@ -91,6 +91,8 @@ void BackgroundServiceLoader::OnServiceErrorOnBackgroundThread(
void BackgroundServiceLoader::ShutdownOnBackgroundThread() {
delete background_loader_;
+ // Destroy |loader_| on the thread it's actually used on.
+ loader_.reset();
}
} // namespace mojo