Update from https://crrev.com/309415

gpu/config/gpu_info.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.h"
 
 namespace {
 
 void EnumerateGPUDevice(gpu::GPUInfo::Enumerator* enumerator,
                         const gpu::GPUInfo::GPUDevice& device) {
@@ skipping 90 matching lines @@
     CollectInfoResult dx_diagnostics_info_state;
     DxDiagNode dx_diagnostics;
 #endif
     std::vector<VideoEncodeAcceleratorSupportedProfile>
         video_encode_accelerator_supported_profiles;
   };
 
   // If this assert fails then most likely something below needs to be updated.
   // Note that this assert is only approximate. If a new field is added to
   // GPUInfo which fits within the current padding then it will not be caught.
-  COMPILE_ASSERT(
+  static_assert(
       sizeof(GPUInfo) == sizeof(GPUInfoKnownFields),
-      Fields_Have_Changed_In_GPUInfo_So_Update_Below);
+      "fields have changed in GPUInfo, GPUInfoKnownFields must be updated");
 
   // Required fields (according to DevTools protocol) first.
   enumerator->AddString("machineModelName", machine_model_name);
   enumerator->AddString("machineModelVersion", machine_model_version);
   EnumerateGPUDevice(enumerator, gpu);
   for (size_t ii = 0; ii < secondary_gpus.size(); ++ii) {
     EnumerateGPUDevice(enumerator, secondary_gpus[ii]);
   }
 
   enumerator->BeginAuxAttributes();
@@ skipping 36 matching lines @@
   // TODO(kbr): add dx_diagnostics on Windows.
   for (size_t ii = 0; ii < video_encode_accelerator_supported_profiles.size();
        ++ii) {
     EnumerateVideoEncodeAcceleratorSupportedProfile(
         enumerator, video_encode_accelerator_supported_profiles[ii]);
   }
   enumerator->EndAuxAttributes();
 }
 
 }  // namespace gpu