[Merge to 2623] Disable IOSurface clearing on OS X 10.9.

ui/gl/test/gl_image_test_template.h

 // Copyright 2015 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.
 
 // This file defines tests that implementations of GLImage should pass in order
 // to be conformant.
 
 #ifndef UI_GL_TEST_GL_IMAGE_TEST_TEMPLATE_H_
 #define UI_GL_TEST_GL_IMAGE_TEST_TEMPLATE_H_
 
 #include <stdint.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringize_macros.h"
 #include "base/strings/stringprintf.h"
+#include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/buffer_format_util.h"
 #include "ui/gfx/buffer_types.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_helper.h"
 #include "ui/gl/gl_image.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/test/gl_image_test_support.h"
 #include "ui/gl/test/gl_test_helper.h"
 
+#if defined(OS_MACOSX)
+#include "base/mac/mac_util.h"
+#endif

[erikchen, 2016/03/23 00:29:35]

Whoops. The test wasn't a part of M49, and it looks like I forgot to get rid of
these extraneous includes during the merge resolution.

+
 namespace gl {
 
 template <typename GLImageTestDelegate>
 class GLImageTest : public testing::Test {
  protected:
   // Overridden from testing::Test:
   void SetUp() override {
     GLImageTestSupport::InitializeGL();
     surface_ = gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size());
     context_ = gfx::GLContext::CreateGLContext(nullptr, surface_.get(),
@@ skipping 144 matching lines @@
   image->Destroy(true);
 }
 
 // The GLImageCopyTest test case verifies that the GLImage implementation
 // handles CopyTexImage correctly.
 REGISTER_TYPED_TEST_CASE_P(GLImageCopyTest, CopyTexImage);
 
 }  // namespace gl
 
 #endif  // UI_GL_TEST_GL_IMAGE_TEST_TEMPLATE_H_