Revert 147328 - Current status of patch:

gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
===================================================================
--- gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc	(revision 147496)
+++ gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc	(working copy)
@@ -6,7 +6,6 @@
 
 #include <algorithm>
 #include <string>
-#include <vector>
 
 #include "base/string_number_conversions.h"
 #include "gpu/command_buffer/common/gl_mock.h"
@@ -84,9 +83,7 @@
     bool bind_generates_resource) {
   gl_.reset(new StrictMock<MockGLInterface>());
   ::gfx::GLInterface::SetGLInterface(gl_.get());
-  group_ = ContextGroup::Ref(new ContextGroup(NULL,
-                                              bind_generates_resource,
-                                              NULL));
+  group_ = ContextGroup::Ref(new ContextGroup(NULL, bind_generates_resource));
 
   InSequence sequence;
 
@@ -877,7 +874,8 @@
     GLsizei width, GLsizei height, GLint border,
     GLenum format, GLenum type,
     uint32 shared_memory_id, uint32 shared_memory_offset) {
-  if (GLES2Decoder::IsAngle()) {
+  if (GLES2Decoder::IsAngle())
+  {
     EXPECT_CALL(*gl_, TexSubImage2D(
         target, level, 0, 0, width, height, format, type, _))
         .Times(1)