Add support for GL_CHROMIUM_consistent_uniform_locations

gpu/command_buffer/service/gles2_cmd_decoder.cc

Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 3182df8241a0a1af8b4beca730bb49a980c4776b..091b96b264d214247a9e7bfd7eef5f54f0f0d57c 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -4929,7 +4929,7 @@ void GLES2DecoderImpl::LogMessage(const std::string& msg) {
     // LOG this unless logging is turned off as any chromium code that
     // generates these errors probably has a bug.
     if (log_synthesized_gl_errors()) {
-      LOG(ERROR) << last_error_;
+      LOG(ERROR) << msg;
     }
     if (!msg_callback_.is_null()) {
       msg_callback_.Run(0, msg);
@@ -6504,7 +6504,7 @@ error::Error GLES2DecoderImpl::GetUniformLocationHelper(
   if (*location != -1) {
     return error::kGenericError;
   }
-  *location = program_manager()->SwizzleLocation(
+  *location = GLES2Util::SwizzleLocation(
       info->GetUniformFakeLocation(name_str));
   return error::kNoError;
 }
@@ -7813,7 +7813,7 @@ bool GLES2DecoderImpl::GetUniformSetup(
 error::Error GLES2DecoderImpl::HandleGetUniformiv(
     uint32 immediate_data_size, const gles2::GetUniformiv& c) {
   GLuint program = c.program;
-  GLint fake_location = program_manager()->UnswizzleLocation(c.location);
+  GLint fake_location = GLES2Util::UnswizzleLocation(c.location);
   GLuint service_id;
   GLenum result_type;
   GLint real_location = -1;
@@ -7832,7 +7832,7 @@ error::Error GLES2DecoderImpl::HandleGetUniformiv(
 error::Error GLES2DecoderImpl::HandleGetUniformfv(
     uint32 immediate_data_size, const gles2::GetUniformfv& c) {
   GLuint program = c.program;
-  GLint fake_location = program_manager()->UnswizzleLocation(c.location);
+  GLint fake_location = GLES2Util::UnswizzleLocation(c.location);
   GLuint service_id;
   GLint real_location = -1;
   Error error;