Eliminate quit closure argument to embedded service factories

content/common/service_manager/embedded_service_runner.cc

 // Copyright 2016 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 "content/common/service_manager/embedded_service_runner.h"
 
 #include <map>
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 63 matching lines @@
     // If this instance had its own thread, it MUST be explicitly destroyed by
     // QuitOnRunnerThread() by the time this destructor is run.
     DCHECK(!thread_);
   }
 
   void BindServiceRequestOnServiceThread(
       service_manager::mojom::ServiceRequest request) {
     DCHECK(service_task_runner_->BelongsToCurrentThread());
 
     int instance_id = next_instance_id_++;
-    base::Closure quit_closure =
-        base::Bind(&InstanceManager::OnInstanceLost, this, instance_id);
 
-    // TODO(rockot): Get rid of the quit closure argument to the factory
-    // function. Services should request termination via their ServiceContext
-    // once we have that working.
     std::unique_ptr<service_manager::ServiceContext> context =
         base::MakeUnique<service_manager::ServiceContext>(
-            factory_callback_.Run(quit_closure), std::move(request));
+            factory_callback_.Run(), std::move(request));
 
     service_manager::ServiceContext* raw_context = context.get();
-    context->SetConnectionLostClosure(quit_closure);
+    context->SetConnectionLostClosure(
+        base::Bind(&InstanceManager::OnInstanceLost, this, instance_id));
     contexts_.insert(std::make_pair(raw_context, std::move(context)));
     id_to_context_map_.insert(std::make_pair(instance_id, raw_context));
   }
 
   void OnInstanceLost(int instance_id) {
     DCHECK(service_task_runner_->BelongsToCurrentThread());
 
     auto id_iter = id_to_context_map_.find(instance_id);
     CHECK(id_iter != id_to_context_map_.end());
 
@@ skipping 84 matching lines @@
     const base::Closure& quit_closure) {
   quit_closure_ = quit_closure;
 }
 
 void EmbeddedServiceRunner::OnQuit() {
   if (!quit_closure_.is_null())
     quit_closure_.Run();
 }
 
 }  // namespace content