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

content/gpu/gpu_main.cc

Index: content/gpu/gpu_main.cc
===================================================================
--- content/gpu/gpu_main.cc	(revision 201645)
+++ content/gpu/gpu_main.cc	(working copy)
@@ -18,14 +18,13 @@
 #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"
@@ -56,7 +55,7 @@
 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
@@ -155,7 +154,7 @@
     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) &&
@@ -201,8 +200,8 @@
     // 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)
@@ -344,7 +343,7 @@
 }
 
 #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.
@@ -356,7 +355,7 @@
   }
 }
 
-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");