Manually merging trunk revs 95836 and 96904 to 835 branch (second attempt)

gpu/gles2_conform_support/egl/display.cc

Index: gpu/gles2_conform_support/egl/display.cc
===================================================================
--- gpu/gles2_conform_support/egl/display.cc	(revision 98483)
+++ gpu/gles2_conform_support/egl/display.cc	(working copy)
@@ -7,6 +7,7 @@
 #include <vector>
 #include "gpu/command_buffer/client/gles2_lib.h"
 #include "gpu/command_buffer/service/command_buffer_service.h"
+#include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/gpu_scheduler.h"
 #include "gpu/GLES2/gles2_command_buffer.h"
@@ -108,6 +109,7 @@
 
   using gpu::GpuScheduler;
   std::vector<int32> attribs;
+  gpu::gles2::ContextGroup::Ref group(new gpu::gles2::ContextGroup(true));
   scoped_ptr<GpuScheduler> gpu_scheduler(
       GpuScheduler::Create(command_buffer_.get(),
                            NULL,
@@ -159,7 +161,8 @@
       buffer.size,
       buffer.ptr,
       transfer_buffer_id_,
-      share_resources));
+      share_resources,
+      true));
 
   context_->CommandBufferEnableCHROMIUM(
       PEPPER3D_ALLOW_BUFFERS_ON_MULTIPLE_TARGETS);