Don't initialize GL bindings in browser process even if libpic doesn't exist on Linux.

content/gpu/gpu_info_collector_linux.cc

 // Copyright (c) 2011 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 "content/gpu/gpu_info_collector.h"
 
 #include <dlfcn.h>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 146 matching lines @@
         if (end == std::string::npos)
           return line.substr(begin);
         else
           return line.substr(begin, end - begin);
       }
     }
   }
   return "";
 }
 
-// Use glXGetClientString to get driver vendor.
-// Return "" on failing.
-std::string CollectDriverVendorGlx() {
-  // TODO(zmo): handle the EGL/GLES2 case.
-  if (gfx::GetGLImplementation() != gfx::kGLImplementationDesktopGL)
-    return "";
-  Display* display = XOpenDisplay(NULL);
-  if (display == NULL)
-    return "";
-  std::string vendor = glXGetClientString(display, GLX_VENDOR);
-  XCloseDisplay(display);
-  return vendor;
-}
-
-// Return 0 on unrecognized vendor.
-uint32 VendorStringToID(const std::string& vendor_string) {
-  if (StartsWithASCII(vendor_string, "NVIDIA", true))
-    return 0x10de;
-  if (StartsWithASCII(vendor_string, "ATI", true))
-    return 0x1002;
-  // TODO(zmo): find a way to identify Intel cards.
-  return 0;
-}
-
 }  // namespace anonymous
 
 namespace gpu_info_collector {
 
 bool CollectGraphicsInfo(content::GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kGpuNoContextLost)) {
     gpu_info->can_lose_context = false;
   } else {
     // TODO(zmo): need to consider the case where we are running on top
     // of desktop GL and GL_ARB_robustness extension is available.
     gpu_info->can_lose_context =
         (gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2);
   }
 
   gpu_info->finalized = true;
   return CollectGraphicsInfoGL(gpu_info);
 }
 
 bool CollectPreliminaryGraphicsInfo(content::GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
-  if (!gfx::GLSurface::InitializeOneOff()) {
-    LOG(ERROR) << "gfx::GLSurface::InitializeOneOff() failed";
-    return false;
-  }
-
   bool rt = true;
   if (!CollectVideoCardInfo(gpu_info))
     rt = false;
 
   if (gpu_info->vendor_id == 0x1002) {  // ATI
     std::string ati_driver_version = CollectDriverVersionATI();
     if (ati_driver_version != "") {
       gpu_info->driver_vendor = "ATI / AMD";
       gpu_info->driver_version = ati_driver_version;
     }
   }
 
   return rt;
 }
 
 bool CollectVideoCardInfo(content::GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
-  std::string driver_vendor = CollectDriverVendorGlx();
-  if (!driver_vendor.empty()) {
-    gpu_info->driver_vendor = driver_vendor;
-    uint32 vendor_id = VendorStringToID(driver_vendor);
-    if (vendor_id != 0)
-      gpu_info->vendor_id = vendor_id;
-  }
-
   if (IsPciSupported() == false) {
     VLOG(1) << "PCI bus scanning is not supported";
     return false;
   }
 
   // TODO(zmo): be more flexible about library name.
   PciInterface* interface = InitializeLibPci("libpci.so.3");
   if (interface == NULL)
     interface = InitializeLibPci("libpci.so");
   if (interface == NULL) {
@@ skipping 95 matching lines @@
     return false;
   if (pos != std::string::npos)
     driver_version = driver_version.substr(0, pos);
 
   gpu_info->driver_vendor = pieces[1];
   gpu_info->driver_version = driver_version;
   return true;
 }
 
 }  // namespace gpu_info_collector