Update from https://crrev.com/307330

ui/gl/gpu_switching_manager.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 "ui/gl/gpu_switching_manager.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "ui/gl/gl_switches.h"
 
 #if defined(OS_MACOSX)
+#include <OpenGL/OpenGL.h>
 #include "base/mac/mac_util.h"
 #include "ui/gl/gl_context_cgl.h"
 #endif  // OS_MACOSX
 
 namespace ui {
 
+struct GpuSwitchingManager::PlatformSpecific {
+#if defined(OS_MACOSX)
+  CGLPixelFormatObj discrete_pixel_format;
+#endif  // OS_MACOSX
+};
+
 // static
 GpuSwitchingManager* GpuSwitchingManager::GetInstance() {
   return Singleton<GpuSwitchingManager>::get();
 }
 
 GpuSwitchingManager::GpuSwitchingManager()
     : gpu_switching_option_(gfx::PreferIntegratedGpu),
       gpu_switching_option_set_(false),
       supports_dual_gpus_(false),
       supports_dual_gpus_set_(false),
-      gpu_count_(0) {
+      gpu_count_(0),
+      platform_specific_(new PlatformSpecific) {
 #if defined(OS_MACOSX)
-  discrete_pixel_format_ = NULL;
+  platform_specific_->discrete_pixel_format = nullptr;
 #endif  // OS_MACOSX
 }
 
 GpuSwitchingManager::~GpuSwitchingManager() {
 #if defined(OS_MACOSX)
-  if (discrete_pixel_format_)
-    CGLReleasePixelFormat(discrete_pixel_format_);
+  if (platform_specific_->discrete_pixel_format)
+    CGLReleasePixelFormat(platform_specific_->discrete_pixel_format);
 #endif  // OS_MACOSX
 }
 
 void GpuSwitchingManager::ForceUseOfIntegratedGpu() {
   DCHECK(SupportsDualGpus());
   if (gpu_switching_option_set_) {
     DCHECK_EQ(gpu_switching_option_, gfx::PreferIntegratedGpu);
   } else {
     gpu_switching_option_ = gfx::PreferIntegratedGpu;
     gpu_switching_option_set_ = true;
@@ skipping 68 matching lines @@
 
 gfx::GpuPreference GpuSwitchingManager::AdjustGpuPreference(
     gfx::GpuPreference gpu_preference) {
   if (!gpu_switching_option_set_)
     return gpu_preference;
   return gpu_switching_option_;
 }
 
 #if defined(OS_MACOSX)
 void GpuSwitchingManager::SwitchToDiscreteGpuMac() {
-  if (discrete_pixel_format_)
+  if (platform_specific_->discrete_pixel_format)
     return;
   CGLPixelFormatAttribute attribs[1];
   attribs[0] = static_cast<CGLPixelFormatAttribute>(0);
   GLint num_pixel_formats = 0;
-  CGLChoosePixelFormat(attribs, &discrete_pixel_format_, &num_pixel_formats);
+  CGLChoosePixelFormat(attribs, &platform_specific_->discrete_pixel_format,
+                       &num_pixel_formats);
 }
 #endif  // OS_MACOSX
 
 }  // namespace ui