Validate fbo color image format and fragment shader output variable type.

gpu/command_buffer/service/context_state_unittest.cc

Index: gpu/command_buffer/service/context_state_unittest.cc
diff --git a/gpu/command_buffer/service/context_state_unittest.cc b/gpu/command_buffer/service/context_state_unittest.cc
index 7571f8138e9627820ef1e801c67ba1db2e456e12..827f595094cda14c2071aa7a46ef8dcb3d31a101 100644
--- a/gpu/command_buffer/service/context_state_unittest.cc
+++ b/gpu/command_buffer/service/context_state_unittest.cc
@@ -13,7 +13,7 @@ namespace gles2 {
 
 TEST(ContextStateVec4Test, DefaultValues) {
   Vec4 v;
-  EXPECT_EQ(Vec4::kFloat, v.type());
+  EXPECT_EQ(SHADER_VARIABLE_FLOAT, v.type());
   GLfloat f[4];
   v.GetValues(f);
   EXPECT_EQ(0.f, f[0]);
@@ -27,7 +27,7 @@ TEST(ContextStateVec4Test, SetGetFloatValues) {
 
   const GLfloat kFloatValues[4] = { 2.f, 3.f, 4.f, 5.f };
   v.SetValues(kFloatValues);
-  EXPECT_EQ(Vec4::kFloat, v.type());
+  EXPECT_EQ(SHADER_VARIABLE_FLOAT, v.type());
   GLfloat fv[4];
   v.GetValues(fv);
   for (size_t ii = 0; ii < 4; ++ii) {
@@ -40,7 +40,7 @@ TEST(ContextStateVec4Test, SetGetIntValues) {
 
   const GLint kIntValues[4] = { 2, 3, -4, 5 };
   v.SetValues(kIntValues);
-  EXPECT_EQ(Vec4::kInt, v.type());
+  EXPECT_EQ(SHADER_VARIABLE_INT, v.type());
   GLint iv[4];
   v.GetValues(iv);
   for (size_t ii = 0; ii < 4; ++ii) {
@@ -53,7 +53,7 @@ TEST(ContextStateVec4Test, SetGetUIntValues) {
 
   const GLuint kUIntValues[4] = { 2, 3, 4, 5 };
   v.SetValues(kUIntValues);
-  EXPECT_EQ(Vec4::kUInt, v.type());
+  EXPECT_EQ(SHADER_VARIABLE_UINT, v.type());
   GLuint uiv[4];
   v.GetValues(uiv);
   for (size_t ii = 0; ii < 4; ++ii) {