Revert 67293 BrowserTestCanLaunchWithOSMesa was consistently failing - Initia...

media/tools/player_x11/gles_video_renderer.cc

 // Copyright (c) 2010 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 "media/tools/player_x11/gles_video_renderer.h"
 
 #include <dlfcn.h>
 #include <EGL/eglext.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/Xrender.h>
@@ skipping 346 matching lines @@
                                      GLenum type,
                                      const char* source,
                                      int size) {
   GLuint shader = glCreateShader(type);
   glShaderSource(shader, 1, &source, &size);
   glCompileShader(shader);
   int result = GL_FALSE;
   glGetShaderiv(shader, GL_COMPILE_STATUS, &result);
   if (!result) {
     char log[kErrorSize];
-    int len = 0;
+    int len;
     glGetShaderInfoLog(shader, kErrorSize - 1, &len, log);
     log[kErrorSize - 1] = 0;
     LOG(FATAL) << log;
   }
   glAttachShader(program, shader);
   glDeleteShader(shader);
 }
 
 void GlesVideoRenderer::LinkProgram(GLuint program) {
   glLinkProgram(program);
   int result = GL_FALSE;
   glGetProgramiv(program, GL_LINK_STATUS, &result);
   if (!result) {
     char log[kErrorSize];
-    int len = 0;
+    int len;
     glGetProgramInfoLog(program, kErrorSize - 1, &len, log);
     log[kErrorSize - 1] = 0;
     LOG(FATAL) << log;
   }
   glUseProgram(program);
   glDeleteProgram(program);
 }
 
 void GlesVideoRenderer::CreateTextureAndProgramEgl() {
   if (!egl_create_image_khr_)
@@ skipping 114 matching lines @@
 
   int pos_location = glGetAttribLocation(program, "in_pos");
   glEnableVertexAttribArray(pos_location);
   glVertexAttribPointer(pos_location, 2, GL_FLOAT, GL_FALSE, 0, kVertices);
 
   int tc_location = glGetAttribLocation(program, "in_tc");
   glEnableVertexAttribArray(tc_location);
   glVertexAttribPointer(tc_location, 2, GL_FLOAT, GL_FALSE, 0,
                         kTextureCoords);
 }