Correctly handle context lock in TestInProcessContextProvider

TestInProcessContextProvider was not calling

context is lockable. This change updates TestInProcessContextProvider
to optionally support locking, and set up the ContextCacheController
if locking is requested.

ContextCacheController: :SetLock, which is required in cases where the
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I54d1de3768bf958dea944101565fefb99ff2602e
Reviewed-on: https://chromium-review.googlesource.com/1097945Reviewed-by: enne <enne@chromium.org>
Commit-Queue: Eric Karl <ericrk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#566653}

cc/paint/oop_pixeltest.cc

@@ -57,7 +57,7 @@ class OopPixelTest : public testing::Test {
   void SetUp() override {
     raster_context_provider_ =
         base::MakeRefCounted<TestInProcessContextProvider>(
-            /*enable_oop_rasterization=*/true);
+            /*enable_oop_rasterization=*/true, /*support_locking=*/true);
     const int raster_max_texture_size =
         raster_context_provider_->ContextCapabilities().max_texture_size;
     oop_image_cache_.reset(new GpuImageDecodeCache(
@@ -66,7 +66,7 @@ class OopPixelTest : public testing::Test {
 
     gles2_context_provider_ =
         base::MakeRefCounted<TestInProcessContextProvider>(
-            /*enable_oop_rasterization=*/false);
+            /*enable_oop_rasterization=*/false, /*support_locking=*/true);
     const int gles2_max_texture_size =
         raster_context_provider_->ContextCapabilities().max_texture_size;
     gpu_image_cache_.reset(new GpuImageDecodeCache(

cc/test/layer_tree_pixel_test.cc

@@ -46,9 +46,9 @@ LayerTreePixelTest::CreateLayerTreeFrameSink(
   scoped_refptr<TestInProcessContextProvider> worker_context_provider;
   if (test_type_ == PIXEL_TEST_GL) {
     compositor_context_provider = new TestInProcessContextProvider(
-        /*enable_oop_rasterization=*/false);
+        /*enable_oop_rasterization=*/false, /*support_locking=*/false);
     worker_context_provider = new TestInProcessContextProvider(
-        /*enable_oop_rasterization=*/false);
+        /*enable_oop_rasterization=*/false, /*support_locking=*/true);
   }
   static constexpr bool disable_display_vsync = false;
   bool synchronous_composite =
@@ -78,7 +78,7 @@ LayerTreePixelTest::CreateDisplayOutputSurfaceOnThread(
     // compositor.
     auto display_context_provider =
         base::MakeRefCounted<TestInProcessContextProvider>(
-            /*enable_oop_rasterization=*/false);
+            /*enable_oop_rasterization=*/false, /*support_locking=*/false);
     display_context_provider->BindToCurrentThread();
 
     bool flipped_output_surface = false;

cc/test/pixel_test.cc

@@ -196,7 +196,7 @@ void PixelTest::SetUpGLWithoutRenderer(bool flipped_output_surface) {
   enable_pixel_output_ = std::make_unique<gl::DisableNullDrawGLBindings>();
 
   auto context_provider = base::MakeRefCounted<TestInProcessContextProvider>(
-      /*enable_oop_rasterization=*/false);
+      /*enable_oop_rasterization=*/false, /*support_locking=*/false);
   output_surface_ = std::make_unique<PixelTestOutputSurface>(
       std::move(context_provider), flipped_output_surface);
   output_surface_->BindToClient(output_surface_client_.get());
@@ -207,7 +207,7 @@ void PixelTest::SetUpGLWithoutRenderer(bool flipped_output_surface) {
       shared_bitmap_manager_.get());
 
   child_context_provider_ = base::MakeRefCounted<TestInProcessContextProvider>(
-      /*enable_oop_rasterization=*/false);
+      /*enable_oop_rasterization=*/false, /*support_locking=*/false);
   child_context_provider_->BindToCurrentThread();
   child_resource_provider_ =
       std::make_unique<viz::ClientResourceProvider>(true);

cc/test/test_in_process_context_provider.cc

@@ -9,6 +9,7 @@
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
+#include "base/stl_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/viz/common/gpu/context_cache_controller.h"
 #include "components/viz/common/resources/platform_color.h"
@@ -63,7 +64,11 @@ std::unique_ptr<gpu::GLInProcessContext> CreateTestInProcessContext() {
 }
 
 TestInProcessContextProvider::TestInProcessContextProvider(
-    bool enable_oop_rasterization) {
+    bool enable_oop_rasterization,
+    bool support_locking) {
+  if (support_locking)
+    context_lock_.emplace();
+
   if (enable_oop_rasterization) {
     gpu::ContextCreationAttribs attribs;
     attribs.bind_generates_resource = false;
@@ -94,6 +99,8 @@ TestInProcessContextProvider::TestInProcessContextProvider(
             gles2_context_->GetImplementation()->command_buffer(),
             gles2_context_->GetCapabilities());
   }
+
+  cache_controller_->SetLock(GetLock());
 }
 
 TestInProcessContextProvider::~TestInProcessContextProvider() = default;
@@ -154,7 +161,7 @@ viz::ContextCacheController* TestInProcessContextProvider::CacheController() {
 }
 
 base::Lock* TestInProcessContextProvider::GetLock() {
-  return &context_lock_;
+  return base::OptionalOrNullptr(context_lock_);
 }
 
 const gpu::Capabilities& TestInProcessContextProvider::ContextCapabilities()

cc/test/test_in_process_context_provider.h

@@ -37,7 +37,8 @@ class TestInProcessContextProvider
       public viz::ContextProvider,
       public viz::RasterContextProvider {
  public:
-  explicit TestInProcessContextProvider(bool enable_oop_rasterization);
+  explicit TestInProcessContextProvider(bool enable_oop_rasterization,
+                                        bool support_locking);
 
   // viz::ContextProvider / viz::RasterContextProvider implementation.
   void AddRef() const override;
@@ -73,7 +74,7 @@ class TestInProcessContextProvider
   std::unique_ptr<gpu::RasterInProcessContext> raster_context_;
 
   std::unique_ptr<viz::ContextCacheController> cache_controller_;
-  base::Lock context_lock_;
+  base::Optional<base::Lock> context_lock_;
   gpu::GpuFeatureInfo gpu_feature_info_;
 };
 

cc/trees/layer_tree_host_pixeltest_scrollbars.cc

@@ -156,7 +156,8 @@ TEST_F(LayerTreeHostScrollbarsPixelTest, MAYBE_HugeTransformScale) {
   background->AddChild(layer);
 
   scoped_refptr<TestInProcessContextProvider> context(
-      new TestInProcessContextProvider(/*enable_oop_rasterization=*/false));
+      new TestInProcessContextProvider(/*enable_oop_rasterization=*/false,
+                                       /*support_locking=*/false));
   context->BindToCurrentThread();
   int max_texture_size = 0;
   context->ContextGL()->GetIntegerv(GL_MAX_TEXTURE_SIZE, &max_texture_size);