Provide a way to disable libpci dependency.

gpu/config/gpu_info_collector_linux.cc

 // Copyright 2014 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_linux.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.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 "gpu/config/gpu_info_collector.h"
+#if defined(USE_LIBPCI)

[dnicoara, 2014/10/29 15:34:01]

#ifdef-ed libraries should be the last included libraries.

 #include "library_loaders/libpci.h"
+#endif
 #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 34 matching lines @@
   return std::string();
 }
 
 const uint32 kVendorIDIntel = 0x8086;
 const uint32 kVendorIDNVidia = 0x10de;
 const uint32 kVendorIDAMD = 0x1002;
 
 CollectInfoResult CollectPCIVideoCardInfo(GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
+#if !defined(USE_LIBPCI)
+  return kCollectInfoNonFatalFailure;
+#else
+
   if (IsPciSupported() == false) {
     VLOG(1) << "PCI bus scanning is not supported";
     return kCollectInfoNonFatalFailure;
   }
 
   // TODO(zmo): be more flexible about library name.
   LibPciLoader libpci_loader;
   if (!libpci_loader.Load("libpci.so.3") &&
       !libpci_loader.Load("libpci.so")) {
     VLOG(1) << "Failed to locate libpci";
@@ skipping 52 matching lines @@
     if (gpu_info->gpu.vendor_id == kVendorIDNVidia)
       gpu_info->optimus = true;
     if (gpu_info->gpu.vendor_id == kVendorIDAMD)
       gpu_info->amd_switchable = true;
   }
 
   (libpci_loader.pci_cleanup)(access);
   if (!primary_gpu_identified)
     return kCollectInfoNonFatalFailure;
   return kCollectInfoSuccess;
+#endif
 }
 
 }  // namespace anonymous
 
 CollectInfoResult CollectContextGraphicsInfo(GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
   TRACE_EVENT0("gpu", "gpu_info_collector::CollectGraphicsInfo");
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 97 matching lines @@
   gpu_info->driver_version = driver_version;
   return kCollectInfoSuccess;
 }
 
 void MergeGPUInfo(GPUInfo* basic_gpu_info,
                   const GPUInfo& context_gpu_info) {
   MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
 }
 
 }  // namespace gpu