Revert 201380 "Move GPU device/driver info related code from con..."

> Move GPU device/driver info related code from content to gpu.
> 
> This has been suggested by gman, and agreed by kbr and jam, for the following reasons:
> 
> 1) These are gpu related code, and are independent of content / browser, so putting them under gpu/ is the right thing to do conceptually.
> 
> 2) This enables us to set up tests in various places with the correct blacklisting/driver_bug_workarounds information.  Otherwise, for the moment, gpu/ has no visibility into content/ side, so we have to duplicate the driver_bug_workarounds code and hardwire them for testing purpose.  This is going to cause a lot of bugs in the future, as we have the two pieces of code for the same thing (one for chrome and one for testing) and people will easily forget to update one or the other.
> 
> As for this patch, I didn't change the logic, and try to minimize the refactoring.  All improvements enabled by this relocation will be done in follow-up CLs.
> 
> BUG=230477
> TEST=tree
> TBR=gman@chromium.org, joi@chromium.org, kbr@chromium.org, piman@chromium.org
> 
> Review URL: https://codereview.chromium.org/15385003

TBR=zmo@chromium.org

Review URL: https://codereview.chromium.org/15619004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201386 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 6 deletions

diff --git a/chrome/browser/gpu/gpu_feature_checker.cc b/chrome/browser/gpu/gpu_feature_checker.cc
index 2d7c847..084f0c8 100644
--- a/chrome/browser/gpu/gpu_feature_checker.cc
+++ b/chrome/browser/gpu/gpu_feature_checker.cc
@@ -13,14 +13,14 @@ namespace {
 // A false return value is always valid, but a true one is only valid if full
 // GPU info has been collected in a GPU process.
 bool IsFeatureAllowed(content::GpuDataManager* manager,
-                      gpu::GpuFeatureType feature) {
+                      content::GpuFeatureType feature) {
   return (manager->GpuAccessAllowed(NULL) &&
           !manager->IsFeatureBlacklisted(feature));
 }
 
 }  // namespace
 
-GPUFeatureChecker::GPUFeatureChecker(gpu::GpuFeatureType feature,
+GPUFeatureChecker::GPUFeatureChecker(content::GpuFeatureType feature,
                                      FeatureAvailableCallback callback)
     : feature_(feature),
       callback_(callback) {
diff --git a/chrome/browser/gpu/gpu_feature_checker.h b/chrome/browser/gpu/gpu_feature_checker.h
index 3ab879e..286d786 100644
--- a/chrome/browser/gpu/gpu_feature_checker.h
+++ b/chrome/browser/gpu/gpu_feature_checker.h
@@ -6,9 +6,9 @@
 #define CHROME_BROWSER_GPU_GPU_FEATURE_CHECKER_H_
 
 #include "base/callback.h"
-#include "base/memory/ref_counted.h"
 #include "content/public/browser/gpu_data_manager_observer.h"
-#include "gpu/config/gpu_feature_type.h"
+#include "content/public/common/gpu_feature_type.h"
+#include "base/memory/ref_counted.h"
 
 namespace content {
 class GpuDataManager;
@@ -19,7 +19,7 @@ class GPUFeatureChecker : public base::RefCountedThreadSafe<GPUFeatureChecker>,
  public:
   typedef base::Callback<void(bool feature_available)> FeatureAvailableCallback;
 
-  GPUFeatureChecker(gpu::GpuFeatureType feature,
+  GPUFeatureChecker(content::GpuFeatureType feature,
                     FeatureAvailableCallback callback);
 
   // Check to see if |feature_| is available on the current GPU. |callback_|
@@ -34,7 +34,7 @@ class GPUFeatureChecker : public base::RefCountedThreadSafe<GPUFeatureChecker>,
 
   virtual ~GPUFeatureChecker();
 
-  gpu::GpuFeatureType feature_;
+  content::GpuFeatureType feature_;
   FeatureAvailableCallback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(GPUFeatureChecker);