Index: mojo/service_manager/background_shell_service_loader.cc |
diff --git a/mojo/service_manager/background_shell_service_loader.cc b/mojo/service_manager/background_shell_service_loader.cc |
index 6d7a2582108628a29c9a728b9be3886ffe978b46..ef97255f283cc87fde323d617f9c6473890263a3 100644 |
--- a/mojo/service_manager/background_shell_service_loader.cc |
+++ b/mojo/service_manager/background_shell_service_loader.cc |
@@ -35,8 +35,7 @@ BackgroundShellServiceLoader::BackgroundShellServiceLoader( |
scoped_ptr<ServiceLoader> real_loader, |
const std::string& thread_name, |
base::MessageLoop::Type message_loop_type) |
- : quit_on_shutdown_(false), |
- loader_(real_loader.Pass()), |
+ : loader_(real_loader.Pass()), |
message_loop_type_(message_loop_type), |
thread_name_(thread_name), |
message_loop_created_(true, false), |
@@ -44,11 +43,8 @@ BackgroundShellServiceLoader::BackgroundShellServiceLoader( |
} |
BackgroundShellServiceLoader::~BackgroundShellServiceLoader() { |
- if (thread_) { |
- if (quit_on_shutdown_) |
- task_runner_->PostTask(FROM_HERE, quit_closure_); |
+ if (thread_) |
thread_->Join(); |
- } |
} |
void BackgroundShellServiceLoader::LoadService( |