Move GPU device/driver info related code from content to gpu.

content/gpu/gpu_main.cc

 // Copyright (c) 2012 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 <stdlib.h>
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include "base/debug/trace_event.h"
 #include "base/message_loop.h"
 #include "base/rand_util.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
 #include "content/common/gpu/gpu_config.h"
 #include "content/common/sandbox_linux.h"
 #include "content/gpu/gpu_child_thread.h"
-#include "content/gpu/gpu_info_collector.h"
 #include "content/gpu/gpu_process.h"
 #include "content/gpu/gpu_watchdog_thread.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/common/gpu_switching_option.h"
 #include "content/public/common/main_function_params.h"
 #include "crypto/hmac.h"
+#include "gpu/config/gpu_info_collector.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/gl/gpu_switching_manager.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_com_initializer.h"
 #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
 #include "sandbox/win/src/sandbox.h"
 #elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) && defined(USE_X11)
@@ skipping 10 matching lines @@
 #if defined(OS_LINUX)
 #include "content/public/common/sandbox_init.h"
 #endif
 
 const int kGpuTimeout = 10000;
 
 namespace content {
 namespace {
 void WarmUpSandbox();
 #if defined(OS_LINUX)
-bool StartSandboxLinux(const GPUInfo&, GpuWatchdogThread*, bool);
+bool StartSandboxLinux(const gpu::GPUInfo&, GpuWatchdogThread*, bool);
 #elif defined(OS_WIN)
 bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo*);
 #endif
 }
 
 // Main function for starting the Gpu process.
 int GpuMain(const MainFunctionParams& parameters) {
   TRACE_EVENT0("gpu", "GpuMain");
 
   base::Time start_time = base::Time::Now();
@@ skipping 78 matching lines @@
 
   scoped_refptr<GpuWatchdogThread> watchdog_thread;
 
   // Start the GPU watchdog only after anything that is expected to be time
   // consuming has completed, otherwise the process is liable to be aborted.
   if (enable_watchdog && !delayed_watchdog_enable) {
     watchdog_thread = new GpuWatchdogThread(kGpuTimeout);
     watchdog_thread->Start();
   }
 
-  GPUInfo gpu_info;
+  gpu::GPUInfo gpu_info;
   // Get vendor_id, device_id, driver_version from browser process through
   // commandline switches.
   DCHECK(command_line.HasSwitch(switches::kGpuVendorID) &&
          command_line.HasSwitch(switches::kGpuDeviceID) &&
          command_line.HasSwitch(switches::kGpuDriverVersion));
   bool success = base::HexStringToInt(
       command_line.GetSwitchValueASCII(switches::kGpuVendorID),
       reinterpret_cast<int*>(&(gpu_info.gpu.vendor_id)));
   DCHECK(success);
   success = base::HexStringToInt(
@@ skipping 25 matching lines @@
   // Load and initialize the GL implementation and locate the GL entry points.
   if (gfx::GLSurface::InitializeOneOff()) {
     // We need to collect GL strings (VENDOR, RENDERER) for blacklisting
     // purposes. However, on Mac we don't actually use them. As documented in
     // crbug.com/222934, due to some driver issues, glGetString could take
     // multiple seconds to finish, which in turn cause the GPU process to crash.
     // By skipping the following code on Mac, we don't really lose anything,
     // because the basic GPU information is passed down from browser process
     // and we already registered them through SetGpuInfo() above.
 #if !defined(OS_MACOSX)
-    if (!gpu_info_collector::CollectContextGraphicsInfo(&gpu_info))
-      VLOG(1) << "gpu_info_collector::CollectGraphicsInfo failed";
+    if (!gpu::CollectContextGraphicsInfo(&gpu_info))
+      VLOG(1) << "gpu::CollectGraphicsInfo failed";
     GetContentClient()->SetGpuInfo(gpu_info);
 
 #if defined(OS_LINUX)
     initialized_gl_context = true;
 #if !defined(OS_CHROMEOS)
     if (gpu_info.gpu.vendor_id == 0x10de &&  // NVIDIA
         gpu_info.driver_vendor == "NVIDIA") {
       base::ThreadRestrictions::AssertIOAllowed();
       if (access("/dev/nvidiactl", R_OK) != 0) {
         VLOG(1) << "NVIDIA device file /dev/nvidiactl access denied";
@@ skipping 121 matching lines @@
 
   {
     TRACE_EVENT0("gpu", "Initialize DXVA");
     // Initialize H/W video decoding stuff which fails in the sandbox.
     DXVAVideoDecodeAccelerator::PreSandboxInitialization();
   }
 #endif
 }
 
 #if defined(OS_LINUX)
-void WarmUpSandboxNvidia(const GPUInfo& gpu_info,
+void WarmUpSandboxNvidia(const gpu::GPUInfo& gpu_info,
                          bool should_initialize_gl_context) {
   // We special case Optimus since the vendor_id we see may not be Nvidia.
   bool uses_nvidia_driver = (gpu_info.gpu.vendor_id == 0x10de &&  // NVIDIA.
                              gpu_info.driver_vendor == "NVIDIA") ||
                             gpu_info.optimus;
   if (uses_nvidia_driver && should_initialize_gl_context) {
     // We need this on Nvidia to pre-open /dev/nvidiactl and /dev/nvidia0.
     CreateDummyGlContext();
   }
 }
 
-bool StartSandboxLinux(const GPUInfo& gpu_info,
+bool StartSandboxLinux(const gpu::GPUInfo& gpu_info,
                        GpuWatchdogThread* watchdog_thread,
                        bool should_initialize_gl_context) {
   TRACE_EVENT0("gpu", "Initialize sandbox");
 
   bool res = false;
 
   WarmUpSandboxNvidia(gpu_info, should_initialize_gl_context);
 
   if (watchdog_thread)
     watchdog_thread->Stop();
@@ skipping 20 matching lines @@
     return true;
   }
 
   return false;
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace.
 
 }  // namespace content