Update from https://crrev.com/307330

ui/gl/gpu_switching_manager.h

 // 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.
 
 #ifndef UI_GL_GPU_SWITCHING_MANAGER_H_
 #define UI_GL_GPU_SWITCHING_MANAGER_H_
 
 #include <vector>
 
 #include "base/memory/singleton.h"
 #include "base/observer_list.h"
 #include "ui/gl/gl_export.h"
 #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 {
  public:
   // Getter for the singleton. This will return NULL on failure.
   static GpuSwitchingManager* GetInstance();
 
   // Set the switching option to PreferIntegratedGpu.
   void ForceUseOfIntegratedGpu();
   // Set the switching option to PreferDiscreteGpu; switch to discrete GPU
@@ skipping 23 matching lines @@
   void NotifyGpuSwitched();
 
  private:
   friend struct DefaultSingletonTraits<GpuSwitchingManager>;
 
   GpuSwitchingManager();
   virtual ~GpuSwitchingManager();
 
 #if defined(OS_MACOSX)
   void SwitchToDiscreteGpuMac();
-
-  CGLPixelFormatObj discrete_pixel_format_;
 #endif  // OS_MACOSX
 
   gfx::GpuPreference gpu_switching_option_;
   bool gpu_switching_option_set_;
 
   bool supports_dual_gpus_;
   bool supports_dual_gpus_set_;
 
   size_t gpu_count_;
 
+  struct PlatformSpecific;
+  scoped_ptr<PlatformSpecific> platform_specific_;
+
   ObserverList<GpuSwitchingObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuSwitchingManager);
 };
 
 }  // namespace ui
 
 #endif  // UI_GL_GPU_SWITCHING_MANAGER_H_