Fix standalone gl demos and conformance tests

gpu/demos/framework/window.cc

Index: gpu/demos/framework/window.cc
diff --git a/gpu/demos/framework/window.cc b/gpu/demos/framework/window.cc
index 48ed58cfcd66122dea7314a003be76707bd9da51..ca07a254d7c58260a22a4893839323d7545f12a8 100644
--- a/gpu/demos/framework/window.cc
+++ b/gpu/demos/framework/window.cc
@@ -34,6 +34,9 @@ Window::Window()
 }
 
 Window::~Window() {
+  if (decoder_.get()) {
+    decoder_->Destroy();
+  }
 }
 
 bool Window::Init(int width, int height) {
@@ -92,6 +95,9 @@ bool Window::CreateRenderContext(gfx::PluginWindowHandle hwnd) {
   command_buffer_->SetPutOffsetChangeCallback(
       base::Bind(&GpuScheduler::PutChanged,
                  base::Unretained(gpu_scheduler_.get())));
+  command_buffer_->SetGetBufferChangeCallback(
+      base::Bind(&GpuScheduler::SetGetBuffer,
+                 base::Unretained(gpu_scheduler_.get())));
 
   gles2_cmd_helper_.reset(new GLES2CmdHelper(command_buffer_.get()));
   if (!gles2_cmd_helper_->Initialize(kCommandBufferSize))