wayland patch for inspection

gpu/config/gpu_info_collector_wayland.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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/config/gpu_info_collector.h"
 
-#include <X11/Xlib.h>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
+#include "base/string_util.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_tokenizer.h"
-#include "base/strings/string_util.h"
 #include "library_loaders/libpci.h"
-#include "third_party/libXNVCtrl/NVCtrl.h"
-#include "third_party/libXNVCtrl/NVCtrlLib.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/gl_switches.h"
 
 namespace gpu {
 
 namespace {
 
@@ skipping 27 matching lines @@
         if (end == std::string::npos)
           return line.substr(begin);
         else
           return line.substr(begin, end - begin);
       }
     }
   }
   return std::string();
 }
 
-// Use NVCtrl extention to query NV driver version.
-// Return empty string on failing.
+// XXX
 std::string CollectDriverVersionNVidia() {
-  Display* display = base::MessagePumpForUI::GetDefaultXDisplay();
-  if (!display) {
-    LOG(ERROR) << "XOpenDisplay failed.";
     return std::string();
-  }
-  int event_base = 0, error_base = 0;
-  if (!XNVCTRLQueryExtension(display, &event_base, &error_base)) {
-    LOG(INFO) << "NVCtrl extension does not exist.";
-    return std::string();
-  }
-  int screen_count = ScreenCount(display);
-  for (int screen = 0; screen < screen_count; ++screen) {
-    char* buffer = NULL;
-    if (XNVCTRLIsNvScreen(display, screen) &&
-        XNVCTRLQueryStringAttribute(display, screen, 0,
-                                    NV_CTRL_STRING_NVIDIA_DRIVER_VERSION,
-                                    &buffer)) {
-      std::string driver_version(buffer);
-      XFree(buffer);
-      return driver_version;
-    }
-  }
-  return std::string();
 }
 
 const uint32 kVendorIDIntel = 0x8086;
 const uint32 kVendorIDNVidia = 0x10de;
 const uint32 kVendorIDAMD = 0x1002;
 
 bool CollectPCIVideoCardInfo(GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
   if (IsPciSupported() == false) {
@@ skipping 159 matching lines @@
   gpu_info->driver_version = driver_version;
   return true;
 }
 
 void MergeGPUInfo(GPUInfo* basic_gpu_info,
                   const GPUInfo& context_gpu_info) {
   MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
 }
 
 }  // namespace gpu