Destroy GLES2DecoderImpl before its DecoderClient

In places where we use CommandBufferDirect, it needs to outlive the
GLES2DecoderImpl, as it's the DecoderClient.

Bug: None
Change-Id: I05669a49ca870cadecb37f28498187ded35e8236
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1639357
Auto-Submit: Antoine Labour <piman@chromium.org>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Commit-Queue: Antoine Labour <piman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#665286}

components/viz/service/display_embedder/direct_context_provider.cc

@@ -134,10 +134,11 @@ void DirectContextProvider::Destroy() {
   gl_context_.reset();
   transfer_buffer_.reset();
   gles2_cmd_helper_.reset();
-  command_buffer_.reset();
 
   decoder_->Destroy(have_context);
   decoder_.reset();
+
+  command_buffer_.reset();
 }
 
 void DirectContextProvider::SetGLRendererCopierRequiredState(

gpu/command_buffer/tests/decoder_perftest.cc

@@ -231,9 +231,9 @@ class RecordReplayContext : public GpuControl {
     gles2_implementation_.reset();
     transfer_buffer_.reset();
     gles2_helper_.reset();
-    command_buffer_.reset();
     decoder_->Destroy(true);
     decoder_.reset();
+    command_buffer_.reset();
   }
 
   void StartRecord() {

gpu/command_buffer/tests/gl_manager.cc

@@ -469,13 +469,13 @@ void GLManager::Destroy() {
   }
   transfer_buffer_.reset();
   gles2_helper_.reset();
-  command_buffer_.reset();
   if (decoder_.get()) {
     bool have_context = decoder_->GetGLContext() &&
                         decoder_->GetGLContext()->MakeCurrent(surface_.get());
     decoder_->Destroy(have_context);
     decoder_.reset();
   }
+  command_buffer_.reset();
   context_ = nullptr;
 }
 

gpu/gles2_conform_support/egl/context.cc

@@ -355,10 +355,10 @@ void Context::DestroyService() {
 
   transfer_buffer_.reset();
   gles2_cmd_helper_.reset();
-  command_buffer_.reset();
   if (decoder_)
     decoder_->Destroy(have_context);
   decoder_.reset();
+  command_buffer_.reset();
 }
 
 bool Context::HasService() const {