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

chrome/common/child_process_logging_mac.mm

 // 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 "chrome/common/child_process_logging.h"
 
 #import <Foundation/Foundation.h>
 
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/metrics/variations/variations_util.h"
 #include "chrome/installer/util/google_update_settings.h"
-#include "content/public/common/gpu_info.h"
 #include "googleurl/src/gurl.h"
+#include "gpu/config/gpu_info.h"
 
 namespace child_process_logging {
 
 using base::debug::SetCrashKeyValueFuncT;
 using base::debug::ClearCrashKeyValueFuncT;
 using base::debug::SetCrashKeyValue;
 using base::debug::ClearCrashKey;
 
 const size_t kMaxNumCrashURLChunks = 8;
 const size_t kMaxNumURLChunkValueLength = 255;
@@ skipping 90 matching lines @@
       ClearCrashKey(key);
     }
   }
 }
 
 void SetGpuKeyValue(const char* param_name, const std::string& value_str,
                     SetCrashKeyValueFuncT set_key_func) {
   set_key_func(param_name, value_str);
 }
 
-void SetGpuInfoImpl(const content::GPUInfo& gpu_info,
+void SetGpuInfoImpl(const gpu::GPUInfo& gpu_info,
                     SetCrashKeyValueFuncT set_key_func) {
   SetGpuKeyValue(kGPUVendorIdParamName,
                  base::StringPrintf("0x%04x", gpu_info.gpu.vendor_id),
                  set_key_func);
   SetGpuKeyValue(kGPUDeviceIdParamName,
                  base::StringPrintf("0x%04x", gpu_info.gpu.device_id),
                  set_key_func);
   SetGpuKeyValue(kGPUDriverVersionParamName,
                  gpu_info.driver_version,
                  set_key_func);
   SetGpuKeyValue(kGPUPixelShaderVersionParamName,
                  gpu_info.pixel_shader_version,
                  set_key_func);
   SetGpuKeyValue(kGPUVertexShaderVersionParamName,
                  gpu_info.vertex_shader_version,
                  set_key_func);
   SetGpuKeyValue(kGPUGLVersionParamName,
                  gpu_info.gl_version,
                  set_key_func);
 }
 
-void SetGpuInfo(const content::GPUInfo& gpu_info) {
+void SetGpuInfo(const gpu::GPUInfo& gpu_info) {
   SetGpuInfoImpl(gpu_info, SetCrashKeyValue);
 }
 
 void SetPrinterInfo(const char* printer_info) {
   std::vector<std::string> info;
   base::SplitString(printer_info, ';', &info);
   info.resize(kMaxReportedPrinterRecords);
   for (size_t i = 0; i < info.size(); ++i) {
     std::string key = base::StringPrintf(kPrinterInfoNameFormat, i);
     if (!info[i].empty()) {
@@ skipping 69 matching lines @@
                    base::StringPrintf("%zu", experiments.size()));
 }
 
 void SetChannel(const std::string& channel) {
   // This should match the corresponding string in breakpad_win.cc.
   const std::string kChannelKey = "channel";
   SetCrashKeyValue(kChannelKey, channel);
 }
 
 }  // namespace child_process_logging