Handful of changes to get mus to shutdown correctly

components/mus/gles2/gpu_state.cc

 // Copyright 2015 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 "components/mus/gles2/gpu_state.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_restrictions.h"
 #include "gpu/config/gpu_info_collector.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
 
 #if defined(USE_OZONE)
 #include "ui/ozone/public/ozone_platform.h"
 #endif
 
 namespace mus {
 
 GpuState::GpuState()
     : gpu_thread_("gpu_thread"),
       control_thread_("gpu_command_buffer_control"),
       hardware_rendering_available_(false) {
   base::ThreadRestrictions::ScopedAllowWait allow_wait;
   gpu_thread_.Start();
   control_thread_.Start();
+  control_thread_task_runner_ = control_thread_.task_runner();
   base::WaitableEvent event(true, false);
   gpu_thread_.task_runner()->PostTask(
       FROM_HERE, base::Bind(&GpuState::InitializeOnGpuThread,
                             base::Unretained(this), &event));
   event.Wait();
 }
 
 GpuState::~GpuState() {}
 
 void GpuState::StopThreads() {
   control_thread_.Stop();
+  gpu_thread_.task_runner()->PostTask(
+      FROM_HERE,
+      base::Bind(&GpuState::DestroyGpuSpecificStateOnGpuThread, this));
   gpu_thread_.Stop();
 }
 
 void GpuState::InitializeOnGpuThread(base::WaitableEvent* event) {
   hardware_rendering_available_ = gfx::GLSurface::InitializeOneOff();
   command_buffer_task_runner_ = new CommandBufferTaskRunner;
   driver_manager_.reset(new CommandBufferDriverManager);
   sync_point_manager_.reset(new gpu::SyncPointManager(true));
   share_group_ = new gfx::GLShareGroup;
   mailbox_manager_ = new gpu::gles2::MailboxManagerImpl;
@@ skipping 13 matching lines @@
     LOG_IF(ERROR, result != gpu::kCollectInfoSuccess)
         << "Collect context graphics info failed!";
   }
   event->Signal();
 
 #if defined(USE_OZONE)
   ui::OzonePlatform::InitializeForGPU();
 #endif
 }
 
+void GpuState::DestroyGpuSpecificStateOnGpuThread() {
+  driver_manager_.reset();
+}
+
 }  // namespace mus