Allow GLES2CmdDecoder to change the GLSurface associated with the default FBO.

gpu/command_buffer/tests/gl_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/client/gles2_lib.h"
 #include "gpu/command_buffer/client/transfer_buffer.h"
 #include "gpu/command_buffer/common/constants.h"
@@ skipping 98 matching lines @@
   decoder_->set_engine(gpu_scheduler_.get());
 
   surface_ = gfx::GLSurface::CreateOffscreenGLSurface(false, size);
   ASSERT_TRUE(surface_.get() != NULL) << "could not create offscreen surface";
 
   context_ = gfx::GLContext::CreateGLContext(share_group_.get(),
                                              surface_.get(),
                                              gpu_preference);
   ASSERT_TRUE(context_.get() != NULL) << "could not create GL context";
 
+  ASSERT_TRUE(context_->MakeCurrent(surface_.get()));
+
   ASSERT_TRUE(decoder_->Initialize(
       surface_.get(),
       context_.get(),
       true,
       size,
       ::gpu::gles2::DisallowedFeatures(),
       allowed_extensions,
       attribs)) << "could not initialize decoder";
 
   command_buffer_->SetPutOffsetChangeCallback(
@@ skipping 32 matching lines @@
   if (gles2_implementation_.get()) {
     MakeCurrent();
     EXPECT_TRUE(glGetError() == GL_NONE);
     gles2_implementation_->Flush();
     gles2_implementation_.reset();
   }
   transfer_buffer_.reset();
   gles2_helper_.reset();
   command_buffer_.reset();
   if (decoder_.get()) {
-    decoder_->Destroy();
+    decoder_->MakeCurrent();
+    decoder_->Destroy(true);
   }
 }
 
 void GLManager::PumpCommands() {
   decoder_->MakeCurrent();
   gpu_scheduler_->PutChanged();
   ::gpu::CommandBuffer::State state = command_buffer_->GetState();
   ASSERT_EQ(::gpu::error::kNoError, state.error);
 }
 
 bool GLManager::GetBufferChanged(int32 transfer_buffer_id) {
   return gpu_scheduler_->SetGetBuffer(transfer_buffer_id);
 }
 
 }  // namespace gpu