Update Context Client Visibility to use Scoped Pattern

gpu/command_buffer/client/gles2_implementation_unittest.cc

 // Copyright (c) 2012 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.
 
 // Tests for GLES2Implementation.
 
 #include "gpu/command_buffer/client/gles2_implementation.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 #include <GLES3/gl3.h>
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/compiler_specific.h"
+#include "base/memory/ptr_util.h"
 #include "gpu/command_buffer/client/client_test_helper.h"
 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
 #include "gpu/command_buffer/client/program_info_manager.h"
 #include "gpu/command_buffer/client/query_tracker.h"
 #include "gpu/command_buffer/client/ring_buffer.h"
 #include "gpu/command_buffer/client/shared_memory_limits.h"
 #include "gpu/command_buffer/client/transfer_buffer.h"
 #include "gpu/command_buffer/common/command_buffer.h"
 #include "gpu/command_buffer/common/sync_token.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 232 matching lines @@
 
 void* MockTransferBuffer::GetResultBuffer() {
   return actual_buffer() + actual_buffer_index_ * alignment_;
 }
 
 int MockTransferBuffer::GetResultOffset() {
   return actual_buffer_index_ * alignment_;
 }
 
 void MockTransferBuffer::Free() {
-  NOTREACHED();
 }
 
 bool MockTransferBuffer::HaveBuffer() const {
   return true;
 }
 
 void* MockTransferBuffer::AllocUpTo(
     unsigned int size, unsigned int* size_allocated) {
   EXPECT_TRUE(size_allocated != NULL);
   EXPECT_TRUE(last_alloc_ == NULL);
@@ skipping 4319 matching lines @@
 }
 
 TEST_F(GLES2ImplementationManualInitTest, FailInitOnTransferBufferFail) {
   ContextInitOptions init_options;
   init_options.transfer_buffer_initialize_fail = true;
   EXPECT_FALSE(Initialize(init_options));
 }
 
 TEST_F(GLES2ImplementationTest, ClientVisibility) {
   EXPECT_FALSE(gl_->AnyClientsVisible());
-  gl_->SetClientVisible(0, true);
-  EXPECT_TRUE(gl_->AnyClientsVisible());
-  gl_->SetClientVisible(0, false);
+  {
+    auto visibility_0 = gl_->ClientBecameVisible();
+    EXPECT_TRUE(gl_->AnyClientsVisible());
+    gl_->ClientBecameNotVisible(std::move(visibility_0));
+    EXPECT_FALSE(gl_->AnyClientsVisible());
+  }
+  {
+    auto visibility_0 = gl_->ClientBecameVisible();
+    auto visibility_1 = gl_->ClientBecameVisible();
+    EXPECT_TRUE(gl_->AnyClientsVisible());
+    gl_->ClientBecameNotVisible(std::move(visibility_0));
+    EXPECT_TRUE(gl_->AnyClientsVisible());
+    gl_->ClientBecameNotVisible(std::move(visibility_1));
+    EXPECT_FALSE(gl_->AnyClientsVisible());
+  }
+}
+
+TEST_F(GLES2ImplementationTest, TrimResources) {
   EXPECT_FALSE(gl_->AnyClientsVisible());
-  gl_->SetClientVisible(0, true);
-  gl_->SetClientVisible(1, true);
-  EXPECT_TRUE(gl_->AnyClientsVisible());
-  gl_->SetClientVisible(0, false);
-  EXPECT_TRUE(gl_->AnyClientsVisible());
-  gl_->SetClientVisible(1, false);
-  EXPECT_FALSE(gl_->AnyClientsVisible());
+
+  // TrimResources while no clients vivisble, this should persist
+  // aggressively_free_resources_, causing further flushes to trim.
+  EXPECT_CALL(*command_buffer(), OnFlush()).Times(2);
+  EXPECT_CALL(*command_buffer(), DestroyTransferBuffer(_)).Times(2);
+  gl_->TrimResources();
+  gl_->Flush();
+  Mock::VerifyAndClearExpectations(command_buffer());
+
+  {
+    // TrimResources while visible, this should not persisit
+    // aggressively_free_resources_, and further flushes should not trim.
+    auto visibility_0 = gl_->ClientBecameVisible();
+    EXPECT_TRUE(gl_->AnyClientsVisible());
+    EXPECT_CALL(*command_buffer(), OnFlush()).Times(2);
+    EXPECT_CALL(*command_buffer(), DestroyTransferBuffer(_)).Times(1);
+    gl_->Flush();
+    gl_->TrimResources();
+    gl_->Flush();
+    Mock::VerifyAndClearExpectations(command_buffer());
+  }
 }
 
 #include "base/macros.h"
 #include "gpu/command_buffer/client/gles2_implementation_unittest_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu