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

gpu/config/gpu_dx_diagnostics_win.cc

Index: gpu/config/gpu_dx_diagnostics_win.cc
===================================================================
--- gpu/config/gpu_dx_diagnostics_win.cc	(revision 0)
+++ gpu/config/gpu_dx_diagnostics_win.cc	(working copy)
@@ -12,17 +12,19 @@
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_com_initializer.h"
-#include "content/gpu/gpu_info_collector.h"
+#include "gpu/config/gpu_info_collector.h"
 
 // Functions in this file depend on functions exported from dxguid.dll.
 #pragma comment(lib, "dxguid.lib")
 
+namespace gpu {
+
 namespace {
 
 // Traverses the IDxDiagContainer tree and populates a tree of DxDiagNode
 // structures that contains property name / value pairs and subtrees of DirectX
 // diagnostic information.
-void RecurseDiagnosticTree(content::DxDiagNode* output,
+void RecurseDiagnosticTree(DxDiagNode* output,
                            IDxDiagContainer* container,
                            int depth) {
   HRESULT hr;
@@ -76,8 +78,7 @@
                                                 arraysize(child_name16));
         if (SUCCEEDED(hr)) {
           std::string child_name8 = WideToUTF8(child_name16);
-          content::DxDiagNode* output_child =
-              &output->children[child_name8];
+          DxDiagNode* output_child = &output->children[child_name8];
 
           IDxDiagContainer* child_container = NULL;
           hr = container->GetChildContainer(child_name16, &child_container);
@@ -93,9 +94,7 @@
 }
 }  // namespace anonymous
 
-namespace gpu_info_collector {
-
-bool GetDxDiagnostics(content::DxDiagNode* output) {
+bool GetDxDiagnostics(DxDiagNode* output) {
   HRESULT hr;
   bool success = false;
   base::win::ScopedCOMInitializer com_initializer;
@@ -136,4 +135,4 @@
 
   return success;
 }
-}  // namespace gpu_info_collector
+}  // namespace gpu