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

ui/gl/test/gl_image_test_template.h

Index: ui/gl/test/gl_image_test_template.h
diff --git a/ui/gl/test/gl_image_test_template.h b/ui/gl/test/gl_image_test_template.h
index 9f2b0716b59a33cf2775bba19f9f9d03644aa10d..b9054b6a8bafc4c0204e42659a8fdf8cb7b4c728 100644
--- a/ui/gl/test/gl_image_test_template.h
+++ b/ui/gl/test/gl_image_test_template.h
@@ -13,6 +13,7 @@
 #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"
@@ -25,6 +26,10 @@
 #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>