Merge 261120 "gpu: Lose context when BeginQueryEXT fails to allo..."

gpu/command_buffer/tests/gl_manager.cc

Index: gpu/command_buffer/tests/gl_manager.cc
===================================================================
--- gpu/command_buffer/tests/gl_manager.cc	(revision 261815)
+++ gpu/command_buffer/tests/gl_manager.cc	(working copy)
@@ -39,9 +39,9 @@
       share_mailbox_manager(NULL),
       virtual_manager(NULL),
       bind_generates_resource(false),
+      lose_context_when_out_of_memory(false),
       context_lost_allowed(false),
-      image_manager(NULL) {
-}
+      image_manager(NULL) {}
 
 GLManager::GLManager()
     : context_lost_allowed_(false) {
@@ -189,12 +189,13 @@
   transfer_buffer_.reset(new TransferBuffer(gles2_helper_.get()));
 
   // Create the object exposing the OpenGL API.
-  gles2_implementation_.reset(new gles2::GLES2Implementation(
-      gles2_helper_.get(),
-      client_share_group,
-      transfer_buffer_.get(),
-      options.bind_generates_resource,
-      gpu_control_.get()));
+  gles2_implementation_.reset(
+      new gles2::GLES2Implementation(gles2_helper_.get(),
+                                     client_share_group,
+                                     transfer_buffer_.get(),
+                                     options.bind_generates_resource,
+                                     options.lose_context_when_out_of_memory,
+                                     gpu_control_.get()));
 
   ASSERT_TRUE(gles2_implementation_->Initialize(
       kStartTransferBufferSize,