Initialize GL in GpuMemoryBuffer tests for ozone

This will allow GpuMemoryBufferFactoryTest and GpuMemoryBufferImplTest
to run on ozone platforms (e.g. Chromebooks).

BUG=958387

Change-Id: Iff5704b5ac3bdd04ebdd1151be844ddc8888613c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1806423Reviewed-by: Daniele Castagna <dcastagna@chromium.org>
Reviewed-by: Jonathan Backer <backer@chromium.org>
Reviewed-by: Robert Kroeger <rjkroege@chromium.org>
Commit-Queue: Mohsen Izadi <mohsen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704342}

gpu/ipc/common/gpu_memory_buffer_impl_test_template.h

@@ -14,7 +14,7 @@
 #include <memory>
 
 #include "base/bind.h"
-#include "base/task/single_thread_task_executor.h"
+#include "base/test/task_environment.h"
 #include "build/build_config.h"
 #include "gpu/ipc/common/gpu_memory_buffer_support.h"
 #include "mojo/public/cpp/base/shared_memory_mojom_traits.h"
@@ -23,7 +23,7 @@
 #include "ui/gfx/buffer_format_util.h"
 #include "ui/gfx/mojom/buffer_types_mojom_traits.h"
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(USE_OZONE)
 #include "ui/gl/init/gl_factory.h"
 #include "ui/gl/test/gl_surface_test_support.h"
 #endif
@@ -50,12 +50,16 @@ class GpuMemoryBufferImplTest : public testing::Test {
     return &gpu_memory_buffer_support_;
   }
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(USE_OZONE)
   // Overridden from testing::Test:
   void SetUp() override { gl::GLSurfaceTestSupport::InitializeOneOff(); }
   void TearDown() override { gl::init::ShutdownGL(false); }
 #endif
 
+ protected:
+  base::test::TaskEnvironment task_environment_{
+      base::test::TaskEnvironment::MainThreadType::UI};
+
  private:
   GpuMemoryBufferSupport gpu_memory_buffer_support_;
 
@@ -297,7 +301,6 @@ TYPED_TEST_P(GpuMemoryBufferImplTest, PersistentMap) {
 }
 
 TYPED_TEST_P(GpuMemoryBufferImplTest, SerializeAndDeserialize) {
-  base::SingleThreadTaskExecutor main_task_executor;
   const gfx::Size kBufferSize(8, 8);
   const gfx::GpuMemoryBufferType kBufferType = TypeParam::kBufferType;
 

gpu/ipc/service/BUILD.gn

@@ -150,6 +150,7 @@ source_set("test_support") {
     "//testing/gtest:gtest",
   ]
   deps = [
+    "//base/test:test_support",
     "//gpu/ipc/common",
     "//ui/gl:test_support",
   ]

gpu/ipc/service/gpu_memory_buffer_factory_test_template.h

@@ -8,14 +8,15 @@
 #ifndef GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_TEST_TEMPLATE_H_
 #define GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_TEST_TEMPLATE_H_
 
+#include "base/test/task_environment.h"
+#include "build/build_config.h"
 #include "gpu/ipc/common/gpu_memory_buffer_support.h"
 #include "gpu/ipc/service/gpu_memory_buffer_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/buffer_format_util.h"
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(USE_OZONE)
 #include "base/command_line.h"
-#include "build/build_config.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/gl/init/gl_factory.h"
 #include "ui/gl/test/gl_surface_test_support.h"
@@ -26,18 +27,23 @@ namespace gpu {
 template <typename GpuMemoryBufferFactoryType>
 class GpuMemoryBufferFactoryTest : public testing::Test {
  public:
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(USE_OZONE)
   // Overridden from testing::Test:
   void SetUp() override {
+#if defined(OS_WIN)
     // This test only works with hardware rendering.
     DCHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kUseGpuInTests));
+#endif
     gl::GLSurfaceTestSupport::InitializeOneOff();
   }
   void TearDown() override { gl::init::ShutdownGL(false); }
-#endif
+#endif  // defined(OS_WIN) || defined(USE_OZONE)
 
  protected:
+  base::test::TaskEnvironment task_environment_{
+      base::test::TaskEnvironment::MainThreadType::UI};
+
   GpuMemoryBufferFactoryType factory_;
 };