Revert 263998 "PCI scan to find GPU: not limited to just VGA."

Accidentally commited something unrelated to this CL.

> PCI scan to find GPU: not limited to just VGA.
> 
> On Thinkpad T430s with NVIDIA Optimus, the NVIDIA GPU is listed as a
> 3D controller, not a VGA compatible controller.
> 
> BUG=363418
> TEST=
> R=kbr@chromium.org
> 
> Review URL: https://codereview.chromium.org/237673004

TBR=zmo@chromium.org

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

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

4 files changed, 3 insertions, 19 deletions

diff --git a/gpu/config/gpu_blacklist.cc b/gpu/config/gpu_blacklist.cc
index c9fbdf1..8dae999 100644
--- a/gpu/config/gpu_blacklist.cc
+++ b/gpu/config/gpu_blacklist.cc
@@ -42,8 +42,6 @@ GpuBlacklist* GpuBlacklist::Create() {
                             GPU_FEATURE_TYPE_PANEL_FITTING);
   list->AddSupportedFeature("force_compositing_mode",
                             GPU_FEATURE_TYPE_FORCE_COMPOSITING_MODE);
-  list->AddSupportedFeature("gpu_rasterization",
-                            GPU_FEATURE_TYPE_GPU_RASTERIZATION);
   list->set_supports_feature_type_all(true);
   return list;
 }
diff --git a/gpu/config/gpu_blacklist_unittest.cc b/gpu/config/gpu_blacklist_unittest.cc
index a62a87b..c0f75ca 100644
--- a/gpu/config/gpu_blacklist_unittest.cc
+++ b/gpu/config/gpu_blacklist_unittest.cc
@@ -135,8 +135,4 @@ GPU_BLACKLIST_FEATURE_TEST(ForceCompositingMode,
                            "force_compositing_mode",
                            GPU_FEATURE_TYPE_FORCE_COMPOSITING_MODE)
 
-GPU_BLACKLIST_FEATURE_TEST(GpuRasterization,
-                           "gpu_rasterization",
-                           GPU_FEATURE_TYPE_GPU_RASTERIZATION)
-
 }  // namespace gpu
diff --git a/gpu/config/gpu_feature_type.h b/gpu/config/gpu_feature_type.h
index 4abb038..8d78191 100644
--- a/gpu/config/gpu_feature_type.h
+++ b/gpu/config/gpu_feature_type.h
@@ -9,6 +9,7 @@ namespace gpu {
 
 // Provides flags indicating which gpu features are blacklisted for the system
 // on which chrome is currently running.
+// If a bit is set to 1, corresponding feature is blacklisted.
 enum GpuFeatureType {
   GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS = 0,
   GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING,
@@ -22,7 +23,6 @@ enum GpuFeatureType {
   GPU_FEATURE_TYPE_PANEL_FITTING,
   GPU_FEATURE_TYPE_FORCE_COMPOSITING_MODE,
   GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE,
-  GPU_FEATURE_TYPE_GPU_RASTERIZATION,
   NUMBER_OF_GPU_FEATURE_TYPES
 };
 
diff --git a/gpu/config/gpu_info_collector_x11.cc b/gpu/config/gpu_info_collector_x11.cc
index a603d1d..b1182fa 100644
--- a/gpu/config/gpu_info_collector_x11.cc
+++ b/gpu/config/gpu_info_collector_x11.cc
@@ -125,18 +125,8 @@ bool CollectPCIVideoCardInfo(GPUInfo* gpu_info) {
        device != NULL; device = device->next) {
     // Fill the IDs and class fields.
     (libpci_loader.pci_fill_info)(device, 33);
-    bool is_gpu = false;
-    switch (device->device_class) {
-      case PCI_CLASS_DISPLAY_VGA:
-      case PCI_CLASS_DISPLAY_XGA:
-      case PCI_CLASS_DISPLAY_3D:
-        is_gpu = true;
-        break;
-      case PCI_CLASS_DISPLAY_OTHER:
-      default:
-        break;
-    }
-    if (!is_gpu)
+    // TODO(zmo): there might be other classes that qualify as display devices.
+    if (device->device_class != 0x0300)  // Device class is DISPLAY_VGA.
       continue;
 
     GPUInfo::GPUDevice gpu;