Update from https://crrev.com/307330

ui/gl/gpu_switching_manager.h

Index: ui/gl/gpu_switching_manager.h
diff --git a/ui/gl/gpu_switching_manager.h b/ui/gl/gpu_switching_manager.h
index 7e82d62481852762f55e091d3783acc92fb2922e..a6a810f8bf1473ec31b1926db0ce7c4a60ab1b4f 100644
--- a/ui/gl/gpu_switching_manager.h
+++ b/ui/gl/gpu_switching_manager.h
@@ -13,10 +13,6 @@
 #include "ui/gl/gpu_preference.h"
 #include "ui/gl/gpu_switching_observer.h"
 
-#if defined(OS_MACOSX)
-#include <OpenGL/OpenGL.h>
-#endif  // OS_MACOSX
-
 namespace ui {
 
 class GL_EXPORT GpuSwitchingManager {
@@ -60,8 +56,6 @@ class GL_EXPORT GpuSwitchingManager {
 
 #if defined(OS_MACOSX)
   void SwitchToDiscreteGpuMac();
-
-  CGLPixelFormatObj discrete_pixel_format_;
 #endif  // OS_MACOSX
 
   gfx::GpuPreference gpu_switching_option_;
@@ -72,6 +66,9 @@ class GL_EXPORT GpuSwitchingManager {
 
   size_t gpu_count_;
 
+  struct PlatformSpecific;
+  scoped_ptr<PlatformSpecific> platform_specific_;
+
   ObserverList<GpuSwitchingObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuSwitchingManager);