Don't force virtualized contexts for tests

We already look at workarounds. If tests fail without virtualized
contexts we should get the workarounds properly populated.

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I22a8c47260c84bff4b8c8eb2ec457b704eed9e36
Reviewed-on: https://chromium-review.googlesource.com/1028213Reviewed-by: kylechar <kylechar@chromium.org>
Commit-Queue: Jonathan Backer <backer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553670}

components/viz/service/main/viz_main_impl.cc

@@ -261,11 +261,10 @@ void VizMainImpl::CreateFrameSinkManagerInternal(
   DCHECK(gpu_service_);
   DCHECK(gpu_thread_task_runner_->BelongsToCurrentThread());
 
-  constexpr bool force_virtualized_gl_context = false;
   gpu_command_service_ = base::MakeRefCounted<gpu::GpuInProcessThreadService>(
-      force_virtualized_gl_context, gpu_thread_task_runner_,
-      gpu_service_->sync_point_manager(), gpu_service_->mailbox_manager(),
-      gpu_service_->share_group(), gpu_service_->gpu_feature_info(),
+      gpu_thread_task_runner_, gpu_service_->sync_point_manager(),
+      gpu_service_->mailbox_manager(), gpu_service_->share_group(),
+      gpu_service_->gpu_feature_info(),
       gpu_service_->gpu_channel_manager()->gpu_preferences());
 
   compositor_thread_task_runner_->PostTask(

gpu/ipc/gpu_in_process_thread_service.cc

@@ -10,7 +10,6 @@
 namespace gpu {
 
 GpuInProcessThreadService::GpuInProcessThreadService(
-    bool force_virtualized_gl_context,
     scoped_refptr<base::SingleThreadTaskRunner> task_runner,
     gpu::SyncPointManager* sync_point_manager,
     gpu::MailboxManager* mailbox_manager,
@@ -21,7 +20,6 @@ GpuInProcessThreadService::GpuInProcessThreadService(
                                            mailbox_manager,
                                            share_group,
                                            gpu_feature_info),
-      force_virtualized_gl_context_(force_virtualized_gl_context),
       task_runner_(task_runner),
       sync_point_manager_(sync_point_manager) {}
 
@@ -33,8 +31,9 @@ void GpuInProcessThreadService::ScheduleDelayedWork(base::OnceClosure task) {
   task_runner_->PostDelayedTask(FROM_HERE, std::move(task),
                                 base::TimeDelta::FromMilliseconds(2));
 }
+
 bool GpuInProcessThreadService::ForceVirtualizedGLContexts() {
-  return force_virtualized_gl_context_;
+  return false;
 }
 
 gpu::SyncPointManager* GpuInProcessThreadService::sync_point_manager() {

gpu/ipc/gpu_in_process_thread_service.h

@@ -21,7 +21,6 @@ class GL_IN_PROCESS_CONTEXT_EXPORT GpuInProcessThreadService
       public base::RefCountedThreadSafe<GpuInProcessThreadService> {
  public:
   GpuInProcessThreadService(
-      bool force_virtualized_gl_context,
       scoped_refptr<base::SingleThreadTaskRunner> task_runner,
       gpu::SyncPointManager* sync_point_manager,
       gpu::MailboxManager* mailbox_manager,
@@ -43,8 +42,6 @@ class GL_IN_PROCESS_CONTEXT_EXPORT GpuInProcessThreadService
 
   ~GpuInProcessThreadService() override;
 
-  const bool force_virtualized_gl_context_;
-
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   gpu::SyncPointManager* sync_point_manager_;  // Non-owning.

gpu/ipc/in_process_command_buffer.cc

@@ -103,9 +103,8 @@ class GpuInProcessThreadHolder : public base::Thread {
   const scoped_refptr<InProcessCommandBuffer::Service>& GetGpuThreadService() {
     if (!gpu_thread_service_) {
       gpu_thread_service_ = base::MakeRefCounted<GpuInProcessThreadService>(
-          true /* use_virtualized_gl_context */, task_runner(),
-          sync_point_manager_.get(), nullptr, nullptr, gpu_feature_info_,
-          GpuPreferences());
+          task_runner(), sync_point_manager_.get(), nullptr, nullptr,
+          gpu_feature_info_, GpuPreferences());
     }
     return gpu_thread_service_;
   }