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

chrome/browser/metrics/metrics_log.cc

 // 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/browser/metrics/metrics_log.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 25 matching lines @@
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/metrics/proto/omnibox_event.pb.h"
 #include "chrome/common/metrics/proto/profiler_event.pb.h"
 #include "chrome/common/metrics/proto/system_profile.pb.h"
 #include "chrome/common/metrics/variations/variations_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/common/content_client.h"
-#include "content/public/common/gpu_info.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "googleurl/src/gurl.h"
+#include "gpu/config/gpu_info.h"
 #include "ui/gfx/screen.h"
 #include "webkit/plugins/webplugininfo.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/build_info.h"
 #endif
 
 #define OPEN_ELEMENT_FOR_SCOPE(name) ScopedElement scoped_element(this, name)
 
 #if defined(OS_WIN)
@@ skipping 717 matching lines @@
   {
     // Write the XML version.
     // We'll write the protobuf version in RecordEnvironmentProto().
     OPEN_ELEMENT_FOR_SCOPE("os");
     WriteAttribute("name", base::SysInfo::OperatingSystemName());
     WriteAttribute("version", base::SysInfo::OperatingSystemVersion());
   }
 
   {
     OPEN_ELEMENT_FOR_SCOPE("gpu");
-    const content::GPUInfo& gpu_info =
+    const gpu::GPUInfo& gpu_info =
         GpuDataManager::GetInstance()->GetGPUInfo();
 
     // Write the XML version.
     // We'll write the protobuf version in RecordEnvironmentProto().
     WriteIntAttribute("vendorid", gpu_info.gpu.vendor_id);
     WriteIntAttribute("deviceid", gpu_info.gpu.device_id);
   }
 
   {
     const gfx::Size display_size = GetScreenSize();
@@ skipping 79 matching lines @@
   if (base::win::IsMetroProcess())
     os_name += " (Metro)";
 #endif
   os->set_name(os_name);
   os->set_version(base::SysInfo::OperatingSystemVersion());
 #if defined(OS_ANDROID)
   os->set_fingerprint(
       base::android::BuildInfo::GetInstance()->android_build_fp());
 #endif
 
-  const content::GPUInfo& gpu_info =
+  const gpu::GPUInfo& gpu_info =
       GpuDataManager::GetInstance()->GetGPUInfo();
   SystemProfileProto::Hardware::Graphics* gpu = hardware->mutable_gpu();
   gpu->set_vendor_id(gpu_info.gpu.vendor_id);
   gpu->set_device_id(gpu_info.gpu.device_id);
   gpu->set_driver_version(gpu_info.driver_version);
   gpu->set_driver_date(gpu_info.driver_date);
   SystemProfileProto::Hardware::Graphics::PerformanceStatistics*
       gpu_performance = gpu->mutable_performance_statistics();
   gpu_performance->set_graphics_score(gpu_info.performance_stats.graphics);
   gpu_performance->set_gaming_score(gpu_info.performance_stats.gaming);
@@ skipping 280 matching lines @@
 
       paired_device->set_vendor_prefix(vendor_prefix);
     }
 
     paired_device->set_vendor_id(device->GetVendorID());
     paired_device->set_product_id(device->GetProductID());
     paired_device->set_device_id(device->GetDeviceID());
   }
 #endif  // defined(OS_CHROMEOS)
 }