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

gpu/config/gpu_dx_diagnostics_win.cc

 // Copyright (c) 2011 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.
 //
 // Functions to enumerate the Dx Diagnostic Tool hierarchy and build up
 // a tree of nodes with name / value properties.
 
 #define INITGUID
 #include <dxdiag.h>
 #include <windows.h>
 
 #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;
 
   VARIANT variant;
   VariantInit(&variant);
 
   DWORD prop_count;
   hr = container->GetNumberOfProps(&prop_count);
   if (SUCCEEDED(hr)) {
@@ skipping 33 matching lines @@
     DWORD child_count;
     hr = container->GetNumberOfChildContainers(&child_count);
     if (SUCCEEDED(hr)) {
       for (DWORD i = 0; i < child_count; i++) {
         WCHAR child_name16[256];
         hr = container->EnumChildContainerNames(i,
                                                 child_name16,
                                                 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);
           if (SUCCEEDED(hr)) {
             RecurseDiagnosticTree(output_child, child_container, depth - 1);
 
             child_container->Release();
           }
         }
       }
     }
   }
 }
 }  // 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;
 
   IDxDiagProvider* provider = NULL;
   hr = CoCreateInstance(CLSID_DxDiagProvider,
                          NULL,
                          CLSCTX_INPROC_SERVER,
                          IID_IDxDiagProvider,
                          reinterpret_cast<void**>(&provider));
@@ skipping 20 matching lines @@
         }
 
         root->Release();
       }
     }
     provider->Release();
   }
 
   return success;
 }
-}  // namespace gpu_info_collector
+}  // namespace gpu