Update from https://crrev.com/316786

gpu/command_buffer/tests/gl_test_utils.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_test_utils.h"
 #include <string>
 #include <stdio.h>
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 13 matching lines @@
    bool success = true;
    GLenum error = GL_NO_ERROR;
    while ((error = glGetError()) != GL_NO_ERROR) {
      success = false;
      EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), error)
          << "GL ERROR in " << msg << " at line " << line << " : " << error;
    }
    return success;
 }
 
-GLuint GLTestHelper::LoadShader(GLenum type, const char* shaderSrc) {
+GLuint GLTestHelper::CompileShader(GLenum type, const char* shaderSrc) {
   GLuint shader = glCreateShader(type);
   // Load the shader source
   glShaderSource(shader, 1, &shaderSrc, NULL);
   // Compile the shader
   glCompileShader(shader);
+
+  return shader;
+}
+
+GLuint GLTestHelper::LoadShader(GLenum type, const char* shaderSrc) {
+  GLuint shader = CompileShader(type, shaderSrc);
+
   // Check the compile status
   GLint value = 0;
   glGetShaderiv(shader, GL_COMPILE_STATUS, &value);
   if (value == 0) {
     char buffer[1024];
     GLsizei length = 0;
     glGetShaderInfoLog(shader, sizeof(buffer), &length, buffer);
     std::string log(buffer, length);
     EXPECT_EQ(1, value) << "Error compiling shader: " << log;
     glDeleteShader(shader);
     shader = 0;
   }
   return shader;
 }
 
-GLuint GLTestHelper::SetupProgram(
+GLuint GLTestHelper::LinkProgram(
     GLuint vertex_shader, GLuint fragment_shader) {
   // Create the program object
   GLuint program = glCreateProgram();
   glAttachShader(program, vertex_shader);
   glAttachShader(program, fragment_shader);
   // Link the program
   glLinkProgram(program);
+
+  return program;
+}
+
+GLuint GLTestHelper::SetupProgram(
+    GLuint vertex_shader, GLuint fragment_shader) {
+  GLuint program = LinkProgram(vertex_shader, fragment_shader);
   // Check the link status
   GLint linked = 0;
   glGetProgramiv(program, GL_LINK_STATUS, &linked);
   if (linked == 0) {
     char buffer[1024];
     GLsizei length = 0;
     glGetProgramInfoLog(program, sizeof(buffer), &length, buffer);
     std::string log(buffer, length);
     EXPECT_EQ(1, linked) << "Error linking program: " << log;
     glDeleteProgram(program);
@@ skipping 159 matching lines @@
   Set32BitValue(bih.y_pels_per_meter, 0);
   Set32BitValue(bih.clr_used, 0);
   Set32BitValue(bih.clr_important, 0);
 
   fwrite(&bhf, sizeof(bhf), 1, fp);
   fwrite(&bih, sizeof(bih), 1, fp);
   fwrite(pixels, size, 1, fp);
   fclose(fp);
   return true;
 }