Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

ui/gl/gl_context_cgl.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/gl_context_cgl.h"
 
 #include <OpenGL/CGLRenderers.h>
 #include <OpenGL/CGLTypes.h>
 #include <vector>
 
@@ skipping 104 matching lines @@
     Destroy();
     return false;
   }
 
   gpu_preference_ = gpu_preference;
   return true;
 }
 
 void GLContextCGL::Destroy() {
   if (discrete_pixelformat_) {
-    if (base::MessageLoop::current() != NULL) {
-      // Delay releasing the pixel format for 10 seconds to reduce the number of
-      // unnecessary GPU switches.
-      base::MessageLoop::current()->PostDelayedTask(
-          FROM_HERE, base::Bind(&CGLReleasePixelFormat, discrete_pixelformat_),
-          base::TimeDelta::FromSeconds(10));
-    } else {
-      CGLReleasePixelFormat(discrete_pixelformat_);
-    }
+    // Delay releasing the pixel format for 10 seconds to reduce the number of
+    // unnecessary GPU switches.
+    base::MessageLoop::current()->PostDelayedTask(
+        FROM_HERE,
+        base::Bind(&CGLReleasePixelFormat, discrete_pixelformat_),
+        base::TimeDelta::FromSeconds(10));
     discrete_pixelformat_ = NULL;
   }
   if (context_) {
     CGLDestroyContext(static_cast<CGLContextObj>(context_));
     context_ = NULL;
   }
 }
 
 bool GLContextCGL::ForceGpuSwitchIfNeeded() {
   DCHECK(context_);
@@ skipping 161 matching lines @@
 
 GLContextCGL::~GLContextCGL() {
   Destroy();
 }
 
 GpuPreference GLContextCGL::GetGpuPreference() {
   return gpu_preference_;
 }
 
 }  // namespace gfx