gpu: Destroy the BindingSet on the thread it's bound on.

services/ui/gpu/gpu_service.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 "services/ui/gpu/gpu_service.h"
 
 #include "base/bind.h"
 #include "base/debug/crash_logging.h"
 #include "base/lazy_instance.h"
 #include "base/memory/shared_memory.h"
@@ skipping 56 matching lines @@
     const base::Callback<void(const Param&)>& callback) {
   return base::Bind(
       [](scoped_refptr<base::SingleThreadTaskRunner> runner,
          const base::Callback<void(const Param&)>& callback,
          const Param& param) {
         runner->PostTask(FROM_HERE, base::Bind(callback, param));
       },
       runner, callback);
 }
 
+void DestroyBinding(
+    std::unique_ptr<mojo::BindingSet<mojom::GpuService>> binding) {
+  binding->CloseAllBindings();
+}
+
 }  // namespace
 
 GpuService::GpuService(const gpu::GPUInfo& gpu_info,
                        std::unique_ptr<gpu::GpuWatchdogThread> watchdog_thread,
                        gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory,
                        scoped_refptr<base::SingleThreadTaskRunner> io_runner,
                        const gpu::GpuFeatureInfo& gpu_feature_info)
     : main_runner_(base::ThreadTaskRunnerHandle::Get()),
       io_runner_(std::move(io_runner)),
       shutdown_event_(base::WaitableEvent::ResetPolicy::MANUAL,
                       base::WaitableEvent::InitialState::NOT_SIGNALED),
       watchdog_thread_(std::move(watchdog_thread)),
       gpu_memory_buffer_factory_(gpu_memory_buffer_factory),
       gpu_info_(gpu_info),
       gpu_feature_info_(gpu_feature_info),
       sync_point_manager_(nullptr),
       weak_ptr_factory_(this) {
   weak_ptr_ = weak_ptr_factory_.GetWeakPtr();
 }
 
 GpuService::~GpuService() {
   DCHECK(main_runner_->BelongsToCurrentThread());
   logging::SetLogMessageHandler(nullptr);
   g_log_callback.Get() =
       base::Callback<void(int, size_t, const std::string&)>();
-  bindings_.CloseAllBindings();
+  if (bindings_) {
+    io_runner_->PostTask(FROM_HERE,
+                         base::Bind(&DestroyBinding, base::Passed(&bindings_)));
+  }
   media_gpu_channel_manager_.reset();
   gpu_channel_manager_.reset();
   owned_sync_point_manager_.reset();
 
   // Signal this event before destroying the child process.  That way all
   // background threads can cleanup.
   // For example, in the renderer the RenderThread instances will be able to
   // notice shutdown before the render process begins waiting for them to exit.
   shutdown_event_.Signal();
 }
@@ skipping 54 matching lines @@
     watchdog_thread()->AddPowerObserver();
 }
 
 void GpuService::Bind(mojom::GpuServiceRequest request) {
   if (main_runner_->BelongsToCurrentThread()) {
     io_runner_->PostTask(FROM_HERE,
                          base::Bind(&GpuService::Bind, base::Unretained(this),
                                     base::Passed(std::move(request))));
     return;
   }
-  bindings_.AddBinding(this, std::move(request));
+  if (!bindings_)
+    bindings_ = base::MakeUnique<mojo::BindingSet<mojom::GpuService>>();
+  bindings_->AddBinding(this, std::move(request));
 }
 
 void GpuService::RecordLogMessage(int severity,
                                   size_t message_start,
                                   const std::string& str) {
   // This can be run from any thread.
   std::string header = str.substr(0, message_start);
   std::string message = str.substr(message_start);
   (*gpu_host_)->RecordLogMessage(severity, header, message);
 }
@@ skipping 153 matching lines @@
 }
 
 void GpuService::EstablishGpuChannel(
     int32_t client_id,
     uint64_t client_tracing_id,
     bool is_gpu_host,
     const EstablishGpuChannelCallback& callback) {
   if (io_runner_->BelongsToCurrentThread()) {
     EstablishGpuChannelCallback wrap_callback = base::Bind(
         [](scoped_refptr<base::SingleThreadTaskRunner> runner,
-           const EstablishGpuChannelCallback& callback,
+           const EstablishGpuChannelCallback& cb,
            mojo::ScopedMessagePipeHandle handle) {
-          runner->PostTask(
-              FROM_HERE, base::Bind(callback, base::Passed(std::move(handle))));
+          runner->PostTask(FROM_HERE,
+                           base::Bind(cb, base::Passed(std::move(handle))));
         },
         io_runner_, callback);
     main_runner_->PostTask(
         FROM_HERE,
         base::Bind(&GpuService::EstablishGpuChannel, weak_ptr_, client_id,
                    client_tracing_id, is_gpu_host, wrap_callback));
     return;
   }
 
   if (!gpu_channel_manager_) {
@@ skipping 120 matching lines @@
 
 void GpuService::Stop(const StopCallback& callback) {
   DCHECK(io_runner_->BelongsToCurrentThread());
   main_runner_->PostTaskAndReply(FROM_HERE, base::Bind([] {
                                    base::MessageLoop::current()->QuitWhenIdle();
                                  }),
                                  callback);
 }
 
 }  // namespace ui