gpu/config: remove CollectGpuID

content/browser/gpu/gpu_data_manager_impl_private.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_private.h"
 
 #include <algorithm>
 #include <iterator>
 #include <memory>
 #include <utility>
@@ skipping 223 matching lines @@
                              void* gpu_data_manager) {
   if (flags == kCGDisplayBeginConfigurationFlag)
     return; // This call contains no information about the display change
 
   GpuDataManagerImpl* manager =
       reinterpret_cast<GpuDataManagerImpl*>(gpu_data_manager);
   DCHECK(manager);
 
   bool gpu_changed = false;
   if (flags & kCGDisplayAddFlag) {
-    uint32_t vendor_id, device_id;
-    if (gpu::CollectGpuID(&vendor_id, &device_id) == gpu::kCollectInfoSuccess) {
-      gpu_changed = manager->UpdateActiveGpu(vendor_id, device_id);
+    gpu::GPUInfo gpu_info;
+    if (gpu::CollectBasicGraphicsInfo(&gpu_info) == gpu::kCollectInfoSuccess) {
+      gpu_changed = manager->UpdateActiveGpu(gpu_info.gpu.vendor_id,
+                                             gpu_info.gpu.device_id);

[ccameron, 2017/05/12 23:46:10]

For dual-GPU macs, gpu_info.gpu always refers to the dGPU.

I think that this was supposed to be the active GPU.

     }
   }
 
   if (gpu_changed)
     manager->HandleGpuSwitch();
 }
 #endif  // OS_MACOSX
 
 // Block all domains' use of 3D APIs for this many milliseconds if
 // approaching a threshold where system stability might be compromised.
@@ skipping 1110 matching lines @@
   gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure;
 #if defined(OS_WIN)
   gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure;
 #endif
   complete_gpu_info_already_requested_ = true;
   // Some observers might be waiting.
   NotifyGpuInfoUpdate();
 }
 
 }  // namespace content