Revert of Use the updated AMD switchable info collection code.

gpu/config/gpu_info_collector_win.cc

Index: gpu/config/gpu_info_collector_win.cc
diff --git a/gpu/config/gpu_info_collector_win.cc b/gpu/config/gpu_info_collector_win.cc
index 65d75ec91a1c3ee78c255da2a57eed4c4e541144..556842c3e8ec1a49977fa5fd791f9fd36b676843 100644
--- a/gpu/config/gpu_info_collector_win.cc
+++ b/gpu/config/gpu_info_collector_win.cc
@@ -363,14 +363,13 @@
 }  // namespace anonymous
 
 #if !defined(GOOGLE_CHROME_BUILD)
-void GetAMDVideocardInfo(GPUInfo* gpu_info) {
-  DCHECK(gpu_info);
-  return;
+AMDVideoCardType GetAMDVideocardType() {
+  return STANDALONE;
 }
 #else
 // This function has a real implementation for official builds that can
 // be found in src/third_party/amd.
-void GetAMDVideocardInfo(GPUInfo* gpu_info);
+AMDVideoCardType GetAMDVideocardType();
 #endif
 
 bool CollectDriverInfoD3D(const std::wstring& device_id,
@@ -434,14 +433,9 @@
             // signal the videocard is assumed to be switchable. Additionally,
             // some switchable systems with Intel GPUs aren't correctly
             // detected, so always count them.
-            GetAMDVideocardInfo(gpu_info);
-            if (!gpu_info->amd_switchable &&
-                gpu_info->gpu.vendor_id == 0x8086) {
-              gpu_info->amd_switchable = true;
-              gpu_info->secondary_gpus.push_back(gpu_info->gpu);
-              gpu_info->gpu.vendor_id = 0x1002;
-              gpu_info->gpu.device_id = 0;  // Unknown discrete AMD GPU.
-            }
+            AMDVideoCardType amd_card_type = GetAMDVideocardType();
+            gpu_info->amd_switchable = (gpu_info->gpu.vendor_id == 0x8086) ||
+                                       (amd_card_type != STANDALONE);
           }
         }