Revert 147328 - Current status of patch:

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 "gpu/command_buffer/tests/gl_manager.h"
-
-#include <vector>
-
 #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"
 #include "gpu/command_buffer/service/command_buffer_service.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/gpu_scheduler.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
+#include "gpu/command_buffer/tests/gl_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_share_group.h"
 #include "ui/gl/gl_surface.h"
 
 namespace gpu {
 
 GLManager::GLManager() {
 }
 
@@ skipping 62 matching lines @@
   attribs.push_back(EGL_BLUE_SIZE);
   attribs.push_back(8);
   attribs.push_back(EGL_ALPHA_SIZE);
   attribs.push_back(8);
   attribs.push_back(EGL_DEPTH_SIZE);
   attribs.push_back(16);
   attribs.push_back(EGL_NONE);
 
   if (!context_group) {
     context_group = new gles2::ContextGroup(
-        mailbox_manager_.get(),
-        kBindGeneratesResource,
-        NULL);
+        mailbox_manager_.get(), kBindGeneratesResource);
   }
 
   decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group));
 
   command_buffer_.reset(new CommandBufferService(
       decoder_->GetContextGroup()->transfer_buffer_manager()));
   ASSERT_TRUE(command_buffer_->Initialize())
       << "could not create command buffer service";
 
   gpu_scheduler_.reset(new GpuScheduler(command_buffer_.get(),
@@ skipping 75 matching lines @@
   ::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