gpu/config: Use angle::GetSystemInfo on Mac

gpu/config/gpu_info_collector.cc

 // Copyright (c) 2012 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 "gpu/config/gpu_info_collector.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <string>
@@ skipping 289 matching lines @@
   for (size_t ii = 0; ii < gpu_info->secondary_gpus.size(); ++ii) {
     if (active_vendor_id == gpu_info->secondary_gpus[ii].vendor_id) {
       gpu_info->secondary_gpus[ii].active = true;
       return;
     }
   }
 }
 
 void FillGPUInfoFromSystemInfo(GPUInfo* gpu_info,
                                angle::SystemInfo* system_info) {
+  DCHECK(system_info->primaryGPUIndex >= 0);
+
   angle::GPUDeviceInfo* primary =
       &system_info->gpus[system_info->primaryGPUIndex];
 
   gpu_info->gpu.vendor_id = primary->vendorId;
   gpu_info->gpu.device_id = primary->deviceId;
+  if (system_info->primaryGPUIndex == system_info->activeGPUIndex) {
+    gpu_info->gpu.active = true;
+  }
 
   gpu_info->driver_vendor = std::move(primary->driverVendor);
   gpu_info->driver_version = std::move(primary->driverVersion);
   gpu_info->driver_date = std::move(primary->driverDate);
 
   for (size_t i = 0; i < system_info->gpus.size(); i++) {
     if (static_cast<int>(i) == system_info->primaryGPUIndex) {
       continue;
     }
 
     GPUInfo::GPUDevice device;
     device.vendor_id = system_info->gpus[i].vendorId;
     device.device_id = system_info->gpus[i].deviceId;
+    if (static_cast<int>(i) == system_info->activeGPUIndex) {
+      device.active = true;
+    }
 
     gpu_info->secondary_gpus.push_back(device);
   }
 
   gpu_info->optimus = system_info->isOptimus;
   gpu_info->amd_switchable = system_info->isAMDSwitchable;
 
   gpu_info->machine_model_name = system_info->machineModelName;
   gpu_info->machine_model_version = system_info->machineModelVersion;
 }
 
 }  // namespace gpu