1 files changed, 5 insertions, 4 deletions
diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc
index abfa92f..321a2ca8 100644
--- a/content/common/gpu/gpu_command_buffer_stub.cc
+++ b/content/common/gpu/gpu_command_buffer_stub.cc
@@ -141,10 +141,15 @@ GpuCommandBufferStub::GpuCommandBufferStub(
   if (share_group) {
     context_group_ = share_group->context_group_;
   } else {
+    gpu::StreamTextureManager* stream_texture_manager = NULL;
+#if defined(OS_ANDROID)
+    stream_texture_manager = channel_->stream_texture_manager();
+#endif
     context_group_ = new gpu::gles2::ContextGroup(
         mailbox_manager,
         image_manager,
         new GpuCommandBufferMemoryTracker(channel),
+        stream_texture_manager,
         true);
   }
 }
@@ -536,10 +541,6 @@ void GpuCommandBufferStub::OnInitialize(
                    base::Unretained(this)));
   }
 
-#if defined(OS_ANDROID)
-  decoder_->SetStreamTextureManager(channel_->stream_texture_manager());
-#endif
-
   if (!command_buffer_->SetSharedStateBuffer(shared_state_shm.Pass())) {
     DLOG(ERROR) << "Failed to map shared stae buffer.";
     OnInitializeFailed(reply_message);