Revert of Re-land: ui: Add GLImage unit test framework.

ui/gl/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
@@ skipping 139 matching lines @@
   }
   if (is_android || is_linux) {
     sources += [
       "gl_implementation_osmesa.cc",
       "gl_implementation_osmesa.h",
     ]
   }
   if (is_linux) {
     deps += [ "//third_party/libevent" ]
   }
-  if (!is_android) {  # TODO(GYP) Enable on Android when osmesa links.
-    deps += [ "//third_party/mesa:osmesa" ]
-  }
   if (use_x11) {
     sources += [
       "gl_bindings_autogen_glx.cc",
       "gl_bindings_autogen_glx.h",
       "gl_context_glx.cc",
       "gl_context_glx.h",
       "gl_context_x11.cc",
       "gl_egl_api_implementation.cc",
       "gl_egl_api_implementation.h",
       "gl_glx_api_implementation.cc",
@@ skipping 108 matching lines @@
 
   configs += [ "//third_party/khronos:khronos_headers" ]
 
   deps = [
     ":gl",
     "//testing/gmock",
   ]
 }
 
 source_set("test_support") {
-  testonly = true
   sources = [
-    "test/gl_image_test_support.cc",
-    "test/gl_image_test_support.h",
-    "test/gl_image_test_template.h",
     "test/gl_surface_test_support.cc",
     "test/gl_surface_test_support.h",
-    "test/gl_test_helper.cc",
-    "test/gl_test_helper.h",
   ]
 
   configs += [ "//third_party/khronos:khronos_headers" ]
 
   deps = [
-    "//testing/gtest",
     ":gl",
   ]
 
   if (use_x11) {
     configs += [ "//build/config/linux:x11" ]
     deps += [
       "//ui/gfx/x",
       "//ui/platform_window/x11",
     ]
   }
 }
 
 # TODO(GYP): Delete this after we've converted everything to GN.
 # The _run targets exist only for compatibility w/ GYP.
 group("gl_unittests_run") {
   testonly = true
   deps = [
     ":gl_unittests",
   ]
 }
 
 test("gl_unittests") {
   sources = [
     "gl_api_unittest.cc",
-    "gl_image_ref_counted_memory_unittest.cc",
-    "gl_image_shared_memory_unittest.cc",
     "gpu_timing_unittest.cc",
     "test/run_all_unittests.cc",
   ]
 
   if (is_win || is_android || is_linux) {
     sources += [
       "egl_api_unittest.cc",
       "test/egl_initialization_displays_unittest.cc",
     ]
   }
 
   if (use_x11) {
     sources += [ "glx_api_unittest.cc" ]
   }
 
   include_dirs = [ "//third_party/khronos" ]
 
   deps = [
     ":gl",
     ":gl_unittest_utils",
     ":test_support",
     "//base",
     "//base/test:test_support",
-    "//skia",
     "//testing/gmock",
     "//testing/gtest",
-    "//ui/gfx",
-  ]
-
-  data_deps = [
-    "//third_party/mesa:osmesa",
   ]
 }
 
 if (is_android) {
   generate_jar_jni("surface_jni_headers") {
     jni_package = "ui/gl"
     classes = [ "android/view/Surface.class" ]
   }
 
   generate_jni("gl_jni_headers") {
     sources = [
       "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java",
       "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java",
     ]
     public_deps = [
       ":surface_jni_headers",
     ]
     jni_package = "ui/gl"
   }
 }