Revert 147328 - Current status of patch:

gpu/command_buffer/service/test_helper.cc

Index: gpu/command_buffer/service/test_helper.cc
===================================================================
--- gpu/command_buffer/service/test_helper.cc	(revision 147496)
+++ gpu/command_buffer/service/test_helper.cc	(working copy)
@@ -4,9 +4,6 @@
 
 #include "gpu/command_buffer/service/test_helper.h"
 
-#include <string>
-#include <algorithm>
-
 #include "base/string_number_conversions.h"
 #include "base/string_tokenizer.h"
 #include "gpu/command_buffer/common/gl_mock.h"
@@ -15,6 +12,8 @@
 #include "gpu/command_buffer/service/program_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#include <string.h>
+
 using ::testing::_;
 using ::testing::DoAll;
 using ::testing::InSequence;
@@ -369,12 +368,18 @@
   }
 }
 
-void TestHelper::SetupProgramSuccessExpectations(
+void TestHelper::SetupShader(
     ::gfx::MockGLInterface* gl,
     AttribInfo* attribs, size_t num_attribs,
     UniformInfo* uniforms, size_t num_uniforms,
     GLuint service_id) {
+  InSequence s;
+
   EXPECT_CALL(*gl,
+      LinkProgram(service_id))
+      .Times(1)
+      .RetiresOnSaturation();
+  EXPECT_CALL(*gl,
       GetProgramiv(service_id, GL_LINK_STATUS, _))
       .WillOnce(SetArgumentPointee<2>(1))
       .RetiresOnSaturation();
@@ -475,22 +480,6 @@
   }
 }
 
-void TestHelper::SetupShader(
-    ::gfx::MockGLInterface* gl,
-    AttribInfo* attribs, size_t num_attribs,
-    UniformInfo* uniforms, size_t num_uniforms,
-    GLuint service_id) {
-  InSequence s;
-
-  EXPECT_CALL(*gl,
-      LinkProgram(service_id))
-      .Times(1)
-      .RetiresOnSaturation();
-
-  SetupProgramSuccessExpectations(
-      gl, attribs, num_attribs, uniforms, num_uniforms, service_id);
-}
-
 }  // namespace gles2
 }  // namespace gpu