Merge 106394 - Fixed bugs with Pepper 3D under dynamic GPU switching.

ui/gfx/gl/gl_context_cgl.cc

Index: ui/gfx/gl/gl_context_cgl.cc
===================================================================
--- ui/gfx/gl/gl_context_cgl.cc	(revision 106439)
+++ ui/gfx/gl/gl_context_cgl.cc	(working copy)
@@ -26,12 +26,14 @@
     GLSurface* compatible_surface, GpuPreference gpu_preference) {
   DCHECK(compatible_surface);
 
-  // Ensure the GPU preference is compatible with contexts already in the
-  // share group.
   GLContextCGL* share_context = share_group() ?
       static_cast<GLContextCGL*>(share_group()->GetContext()) : NULL;
-  if (share_context && gpu_preference != share_context->GetGpuPreference())
-    return false;
+  if (SupportsDualGpus()) {
+    // Ensure the GPU preference is compatible with contexts already in the
+    // share group.
+    if (share_context && gpu_preference != share_context->GetGpuPreference())
+      return false;
+  }
 
   std::vector<CGLPixelFormatAttribute> attribs;
   attribs.push_back(kCGLPFAPBuffer);