diff --git a/mojo/cc/context_provider_mojo.cc b/mojo/cc/context_provider_mojo.cc
index 3bfd1a1..9d57e52 100644
--- a/mojo/cc/context_provider_mojo.cc
+++ b/mojo/cc/context_provider_mojo.cc
@@ -22,6 +22,7 @@
                                     &ContextLostThunk,
                                     this,
                                     Environment::GetDefaultAsyncWaiter());
+  DCHECK(context_);
   return !!context_;
 }
 
diff --git a/services/gles2/command_buffer_driver.cc b/services/gles2/command_buffer_driver.cc
index 0343a2f..5d159b4 100644
--- a/services/gles2/command_buffer_driver.cc
+++ b/services/gles2/command_buffer_driver.cc
@@ -122,11 +122,12 @@
 
   // TODO(piman): ShaderTranslatorCache is currently per-ContextGroup but
   // only needs to be per-thread.
+  bool bind_generates_resource = false;
   scoped_refptr<gpu::gles2::ContextGroup> context_group =
-      new gpu::gles2::ContextGroup(mailbox_manager_.get(),
-                                   new MemoryTrackerStub,
-                                   new gpu::gles2::ShaderTranslatorCache,
-                                   nullptr, nullptr, nullptr, true);
+      new gpu::gles2::ContextGroup(
+          mailbox_manager_.get(), new MemoryTrackerStub,
+          new gpu::gles2::ShaderTranslatorCache, nullptr, nullptr, nullptr,
+          bind_generates_resource);
 
   command_buffer_.reset(
       new gpu::CommandBufferService(context_group->transfer_buffer_manager()));