Revert 147328 - Current status of patch:

gpu/demos/framework/window.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/demos/framework/window.h"
 
-#include <vector>
-
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.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/service/context_group.h"
 #include "gpu/command_buffer/service/transfer_buffer_manager.h"
 #include "gpu/demos/framework/demo.h"
@@ skipping 53 matching lines @@
     TransferBufferManager* manager = new TransferBufferManager();
     transfer_buffer_manager_.reset(manager);
     EXPECT_TRUE(manager->Initialize());
   }
   command_buffer_.reset(
       new CommandBufferService(transfer_buffer_manager_.get()));
   if (!command_buffer_->Initialize()) {
     return false;
   }
 
-  gpu::gles2::ContextGroup::Ref group(new gpu::gles2::ContextGroup(NULL,
-                                                                   true,
-                                                                   NULL));
+  gpu::gles2::ContextGroup::Ref group(new gpu::gles2::ContextGroup(NULL, true));
 
   decoder_.reset(gpu::gles2::GLES2Decoder::Create(group.get()));
   if (!decoder_.get())
     return false;
 
   gpu_scheduler_.reset(new gpu::GpuScheduler(command_buffer_.get(),
                                              decoder_.get(),
                                              NULL));
 
   decoder_->set_engine(gpu_scheduler_.get());
@@ skipping 48 matching lines @@
       kTransferBufferSize,
       kTransferBufferSize)) {
     return false;
   }
 
   return true;
 }
 
 }  // namespace demos
 }  // namespace gpu