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

content/browser/gpu/gpu_data_manager_impl.cc

 // Copyright (c) 2013 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 "content/browser/gpu/gpu_data_manager_impl.h"
 
 #include "content/browser/gpu/gpu_data_manager_impl_private.h"
 
 namespace content {
 
 // static
 GpuDataManager* GpuDataManager::GetInstance() {
   return GpuDataManagerImpl::GetInstance();
 }
 
 // static
 GpuDataManagerImpl* GpuDataManagerImpl::GetInstance() {
   return Singleton<GpuDataManagerImpl>::get();
 }
 
 void GpuDataManagerImpl::InitializeForTesting(
-    const std::string& gpu_blacklist_json, const GPUInfo& gpu_info) {
+    const std::string& gpu_blacklist_json, const gpu::GPUInfo& gpu_info) {
   base::AutoLock auto_lock(lock_);
   private_->InitializeForTesting(gpu_blacklist_json, gpu_info);
 }
 
 bool GpuDataManagerImpl::IsFeatureBlacklisted(int feature) const {
   base::AutoLock auto_lock(lock_);
   return private_->IsFeatureBlacklisted(feature);
 }
 
-GPUInfo GpuDataManagerImpl::GetGPUInfo() const {
+gpu::GPUInfo GpuDataManagerImpl::GetGPUInfo() const {
   base::AutoLock auto_lock(lock_);
   return private_->GetGPUInfo();
 }
 
 void GpuDataManagerImpl::GetGpuProcessHandles(
     const GetGpuProcessHandlesCallback& callback) const {
   base::AutoLock auto_lock(lock_);
   private_->GetGpuProcessHandles(callback);
 }
 
@@ skipping 67 matching lines @@
 void GpuDataManagerImpl::DisableHardwareAcceleration() {
   base::AutoLock auto_lock(lock_);
   private_->DisableHardwareAcceleration();
 }
 
 void GpuDataManagerImpl::Initialize() {
   base::AutoLock auto_lock(lock_);
   private_->Initialize();
 }
 
-void GpuDataManagerImpl::UpdateGpuInfo(const GPUInfo& gpu_info) {
+void GpuDataManagerImpl::UpdateGpuInfo(const gpu::GPUInfo& gpu_info) {
   base::AutoLock auto_lock(lock_);
   private_->UpdateGpuInfo(gpu_info);
 }
 
 void GpuDataManagerImpl::UpdateVideoMemoryUsageStats(
     const GPUVideoMemoryUsageStats& video_memory_usage_stats) {
   base::AutoLock auto_lock(lock_);
   private_->UpdateVideoMemoryUsageStats(video_memory_usage_stats);
 }
 
@@ skipping 14 matching lines @@
   base::AutoLock auto_lock(lock_);
   private_->AppendPluginCommandLine(command_line);
 }
 
 void GpuDataManagerImpl::UpdateRendererWebPrefs(
     WebPreferences* prefs) const {
   base::AutoLock auto_lock(lock_);
   private_->UpdateRendererWebPrefs(prefs);
 }
 
-GpuSwitchingOption GpuDataManagerImpl::GetGpuSwitchingOption() const {
+gpu::GpuSwitchingOption GpuDataManagerImpl::GetGpuSwitchingOption() const {
   base::AutoLock auto_lock(lock_);
   return private_->GetGpuSwitchingOption();
 }
 
 std::string GpuDataManagerImpl::GetBlacklistVersion() const {
   base::AutoLock auto_lock(lock_);
   return private_->GetBlacklistVersion();
 }
 
 base::ListValue* GpuDataManagerImpl::GetBlacklistReasons() const {
@@ skipping 66 matching lines @@
 }
 
 GpuDataManagerImpl::GpuDataManagerImpl()
     : private_(GpuDataManagerImplPrivate::Create(this)) {
 }
 
 GpuDataManagerImpl::~GpuDataManagerImpl() {
 }
 
 }  // namespace content