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

content/test/test_context_provider_factory.cc

Index: content/test/test_context_provider_factory.cc
===================================================================
--- content/test/test_context_provider_factory.cc	(revision 261814)
+++ content/test/test_context_provider_factory.cc	(working copy)
@@ -26,7 +26,9 @@
 scoped_refptr<cc::ContextProvider> TestContextProviderFactory::
     OffscreenContextProviderForMainThread() {
   if (!main_thread_.get() || main_thread_->DestroyedOnMainThread()) {
-    main_thread_ = webkit::gpu::ContextProviderInProcess::CreateOffscreen();
+    bool lose_context_when_out_of_memory = false;
+    main_thread_ = webkit::gpu::ContextProviderInProcess::CreateOffscreen(
+        lose_context_when_out_of_memory);
     if (main_thread_.get() && !main_thread_->BindToCurrentThread())
       main_thread_ = NULL;
   }