Fix gpu_unittests for new Shader Translator header.

gpu/command_buffer/service/program_manager_unittest.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/program_manager.h"
 
 #include <algorithm>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 13 matching lines @@
 using ::testing::DoAll;
 using ::testing::InSequence;
 using ::testing::MatcherCast;
 using ::testing::Pointee;
 using ::testing::Return;
 using ::testing::ReturnRef;
 using ::testing::SetArrayArgument;
 using ::testing::SetArgumentPointee;
 using ::testing::StrEq;
 
+// ANGLE now uses GLenum values directory for types
+// TODO(jmadill): Delete these defines when the ANGLE
+//   roll reliably passes translator version 126
+#if (ANGLE_SH_VERSION >= 126)
+#define SH_FLOAT GL_FLOAT
+#define SH_FLOAT_VEC2 GL_FLOAT_VEC2
+#define SH_FLOAT_VEC3 GL_FLOAT_VEC3
+#define SH_FLOAT_VEC4 GL_FLOAT_VEC4
+#endif
+
 namespace gpu {
 namespace gles2 {
 
 namespace {
 const uint32 kMaxVaryingVectors = 8;
 
 void ShaderCacheCb(const std::string& key, const std::string& shader) {}
 }  // namespace anonymous
 
 class ProgramManagerTest : public GpuServiceTest {
@@ skipping 1724 matching lines @@
   SetExpectationsForProgramLoad(ProgramCache::PROGRAM_LOAD_SUCCESS);
   SetExpectationsForNotCachingProgram();
   SetExpectationsForProgramLoadSuccess();
 
   EXPECT_TRUE(program_->Link(NULL, NULL, NULL,
       Program::kCountOnlyStaticallyUsed, base::Bind(&ShaderCacheCb)));
 }
 
 }  // namespace gles2
 }  // namespace gpu