Revert 147328 - Current status of patch:

gpu/command_buffer/service/test_helper.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/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"
 #include "gpu/command_buffer/common/types.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #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;
 using ::testing::MatcherCast;
 using ::testing::Pointee;
 using ::testing::Return;
 using ::testing::SetArrayArgument;
 using ::testing::SetArgumentPointee;
 using ::testing::StrEq;
 using ::testing::StrictMock;
@@ skipping 334 matching lines @@
           .Times(1)
           .RetiresOnSaturation();
       break;
     default:
       NOTREACHED();
       break;
     }
   }
 }
 
-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();
   EXPECT_CALL(*gl,
       GetProgramiv(service_id, GL_INFO_LOG_LENGTH, _))
       .WillOnce(SetArgumentPointee<2>(0))
       .RetiresOnSaturation();
   EXPECT_CALL(*gl,
       GetProgramiv(service_id, GL_ACTIVE_ATTRIBUTES, _))
@@ skipping 81 matching lines @@
                 service_id, StrEq(element_name)))
                 .WillOnce(Return(info.real_location + jj * 2))
                 .RetiresOnSaturation();
           }
         }
       }
     }
   }
 }
 
-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