Use mus::MojoGpuMemoryBufferManager in mus::GpuService.

components/mus/public/cpp/lib/command_buffer_client_impl.cc

 // Copyright 2014 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/public/cpp/lib/command_buffer_client_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/process/process_handle.h"
 #include "base/threading/thread_restrictions.h"
 #include "components/mus/common/gpu_type_converters.h"
-#include "components/mus/gles2/mojo_buffer_backing.h"
-#include "components/mus/gles2/mojo_gpu_memory_buffer.h"
+#include "components/mus/common/mojo_buffer_backing.h"
+#include "components/mus/common/mojo_gpu_memory_buffer.h"
 #include "gpu/command_buffer/client/gpu_control_client.h"
 #include "gpu/command_buffer/common/command_buffer_id.h"
 #include "gpu/command_buffer/common/gpu_memory_buffer_support.h"
 #include "gpu/command_buffer/common/sync_token.h"
 #include "mojo/public/cpp/system/platform_handle.h"
 
 namespace mus {
 
 namespace {
 
@@ skipping 345 matching lines @@
 
   // It is also safe to wait on the same context.
   if (sync_token->namespace_id() == gpu::CommandBufferNamespace::MOJO &&
       sync_token->command_buffer_id() == GetCommandBufferID())
     return true;
 
   return false;
 }
 
 }  // namespace mus