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

content/gpu/gpu_child_thread.cc

Index: content/gpu/gpu_child_thread.cc
===================================================================
--- content/gpu/gpu_child_thread.cc	(revision 201645)
+++ content/gpu/gpu_child_thread.cc	(working copy)
@@ -13,10 +13,10 @@
 #include "build/build_config.h"
 #include "content/common/child_process.h"
 #include "content/common/gpu/gpu_messages.h"
-#include "content/gpu/gpu_info_collector.h"
 #include "content/gpu/gpu_watchdog_thread.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
+#include "gpu/config/gpu_info_collector.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "ui/gl/gl_implementation.h"
@@ -54,7 +54,7 @@
 
 GpuChildThread::GpuChildThread(GpuWatchdogThread* watchdog_thread,
                                bool dead_on_arrival,
-                               const GPUInfo& gpu_info)
+                               const gpu::GPUInfo& gpu_info)
     : dead_on_arrival_(dead_on_arrival),
       gpu_info_(gpu_info),
       in_browser_process_(false) {
@@ -176,15 +176,15 @@
          in_browser_process_);
 #endif  // OS_WIN
 
-  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_WIN)
   // This is slow, but it's the only thing the unsandboxed GPU process does,
   // and GpuDataManager prevents us from sending multiple collecting requests,
   // so it's OK to be blocking.
-  gpu_info_collector::GetDxDiagnostics(&gpu_info_.dx_diagnostics);
+  gpu::GetDxDiagnostics(&gpu_info_.dx_diagnostics);
   gpu_info_.finalized = true;
 #endif  // OS_WIN