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

content/browser/gpu/gpu_data_manager_impl_private.h

 // 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.
 
 #ifndef CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_IMPL_PRIVATE_H_
 #define CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_IMPL_PRIVATE_H_
 
 #include <list>
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
 #include "base/observer_list_threadsafe.h"
-#include "content/browser/gpu/gpu_blacklist.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
-#include "content/browser/gpu/gpu_driver_bug_list.h"
-#include "content/browser/gpu/gpu_switching_list.h"
+#include "gpu/config/gpu_blacklist.h"
+#include "gpu/config/gpu_driver_bug_list.h"
+#include "gpu/config/gpu_switching_list.h"
 
 namespace content {
 
 class CONTENT_EXPORT GpuDataManagerImplPrivate {
  public:
   static GpuDataManagerImplPrivate* Create(GpuDataManagerImpl* owner);
 
   void InitializeForTesting(
       const std::string& gpu_blacklist_json,
-      const GPUInfo& gpu_info);
+      const gpu::GPUInfo& gpu_info);
   bool IsFeatureBlacklisted(int feature) const;
-  GPUInfo GetGPUInfo() const;
+  gpu::GPUInfo GetGPUInfo() const;
   void GetGpuProcessHandles(
       const GpuDataManager::GetGpuProcessHandlesCallback& callback) const;
   bool GpuAccessAllowed(std::string* reason) const;
   void RequestCompleteGpuInfoIfNeeded();
   bool IsCompleteGpuInfoAvailable() const;
   void RequestVideoMemoryUsageStatsUpdate() const;
   bool ShouldUseSwiftShader() const;
   void RegisterSwiftShaderPath(const base::FilePath& path);
   void AddObserver(GpuDataManagerObserver* observer);
   void RemoveObserver(GpuDataManagerObserver* observer);
   void UnblockDomainFrom3DAPIs(const GURL& url);
   void DisableGpuWatchdog();
   void SetGLStrings(const std::string& gl_vendor,
                     const std::string& gl_renderer,
                     const std::string& gl_version);
   void GetGLStrings(std::string* gl_vendor,
                     std::string* gl_renderer,
                     std::string* gl_version);
   void DisableHardwareAcceleration();
 
   void Initialize();
 
-  void UpdateGpuInfo(const GPUInfo& gpu_info);
+  void UpdateGpuInfo(const gpu::GPUInfo& gpu_info);
 
   void UpdateVideoMemoryUsageStats(
       const GPUVideoMemoryUsageStats& video_memory_usage_stats);
 
   void AppendRendererCommandLine(CommandLine* command_line) const;
 
   void AppendGpuCommandLine(CommandLine* command_line) const;
 
   void AppendPluginCommandLine(CommandLine* command_line) const;
 
   void UpdateRendererWebPrefs(WebPreferences* prefs) const;
 
-  GpuSwitchingOption GetGpuSwitchingOption() const;
+  gpu::GpuSwitchingOption GetGpuSwitchingOption() const;
 
   std::string GetBlacklistVersion() const;
 
   base::ListValue* GetBlacklistReasons() const;
 
   void AddLogMessage(int level,
                      const std::string& header,
                      const std::string& message);
 
   void ProcessCrashed(base::TerminationStatus exit_code);
@@ skipping 75 matching lines @@
   typedef std::map<std::string, DomainBlockEntry> DomainBlockMap;
 
   typedef ObserverListThreadSafe<GpuDataManagerObserver>
       GpuDataManagerObserverList;
 
   explicit GpuDataManagerImplPrivate(GpuDataManagerImpl* owner);
 
   void InitializeImpl(const std::string& gpu_blacklist_json,
                       const std::string& gpu_switching_list_json,
                       const std::string& gpu_driver_bug_list_json,
-                      const GPUInfo& gpu_info);
+                      const gpu::GPUInfo& gpu_info);
 
   void UpdateBlacklistedFeatures(const std::set<int>& features);
 
   // This should only be called once at initialization time, when preliminary
   // gpu info is collected.
   void UpdatePreliminaryBlacklistedFeatures();
 
   // Update the GPU switching status.
   // This should only be called once at initialization time.
-  void UpdateGpuSwitchingManager(const GPUInfo& gpu_info);
+  void UpdateGpuSwitchingManager(const gpu::GPUInfo& gpu_info);
 
   // Notify all observers whenever there is a GPU info update.
   void NotifyGpuInfoUpdate();
 
   // Try to switch to SwiftShader rendering, if possible and necessary.
   void EnableSwiftShaderIfNecessary();
 
   // Helper to extract the domain from a given URL.
   std::string GetDomainFromURL(const GURL& url) const;
 
   // Implementation functions for blocking of 3D graphics APIs, used
   // for unit testing.
   void BlockDomainFrom3DAPIsAtTime(const GURL& url,
                                    GpuDataManagerImpl::DomainGuilt guilt,
                                    base::Time at_time);
   GpuDataManagerImpl::DomainBlockStatus Are3DAPIsBlockedAtTime(
       const GURL& url, base::Time at_time) const;
   int64 GetBlockAllDomainsDurationInMs() const;
 
   bool complete_gpu_info_already_requested_;
 
   std::set<int> blacklisted_features_;
   std::set<int> preliminary_blacklisted_features_;
 
-  GpuSwitchingOption gpu_switching_;
+  gpu::GpuSwitchingOption gpu_switching_;
 
   std::set<int> gpu_driver_bugs_;
 
-  GPUInfo gpu_info_;
+  gpu::GPUInfo gpu_info_;
 
-  scoped_ptr<GpuBlacklist> gpu_blacklist_;
-  scoped_ptr<GpuSwitchingList> gpu_switching_list_;
-  scoped_ptr<GpuDriverBugList> gpu_driver_bug_list_;
+  scoped_ptr<gpu::GpuBlacklist> gpu_blacklist_;
+  scoped_ptr<gpu::GpuSwitchingList> gpu_switching_list_;
+  scoped_ptr<gpu::GpuDriverBugList> gpu_driver_bug_list_;
 
   const scoped_refptr<GpuDataManagerObserverList> observer_list_;
 
   ListValue log_messages_;
 
   bool use_swiftshader_;
 
   base::FilePath swiftshader_path_;
 
   // Current card force-blacklisted due to GPU crashes, or disabled through
@@ skipping 13 matching lines @@
 
   GpuDataManagerImpl* owner_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuDataManagerImplPrivate);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_IMPL_PRIVATE_H_