WIP HW

content/browser/gpu/gpu_data_manager_impl_private.cc

Index: content/browser/gpu/gpu_data_manager_impl_private.cc
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
index bff0dcbb7945b35f97a0752080a5f8123fa6c447..529a6686530007b9833b302c3c4b451c05bfdb74 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private.cc
+++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
@@ -52,6 +52,7 @@
 #include "ui/gfx/android/device_display_info.h"
 #endif  // OS_ANDROID
 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
+#include "components/mus/common/gpu_service.h"
 #include "services/shell/runner/common/client_util.h"
 #endif
 
@@ -270,7 +271,7 @@ enum BlockStatusHistogram {
 bool ShouldDisableHardwareAcceleration() {
 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
   // TODO(rjkroege): Remove this when https://crbug.com/602519 is fixed.
-  if (shell::ShellIsRemote())
+  if (shell::ShellIsRemote() && !mus::GpuService::UseChromeGpuCommandBuffer())
     return true;
 #endif
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ -977,8 +978,8 @@ bool GpuDataManagerImplPrivate::CanUseGpuBrowserCompositor() const {
     return false;
   if (ShouldUseSwiftShader())
     return false;
-  if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_GPU_COMPOSITING))
-    return false;
+  // if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_GPU_COMPOSITING))
+  //  return false;
   return true;
 }