Break //ui/gl/ dependency on //ui/ozone.

ui/gl/gl_image_ozone_native_pixmap_drm_unittest.cc

 // Copyright 2016 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 <fcntl.h>
 #include <libdrm/i915_drm.h>
 #include <linux/types.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <sys/mman.h>
 #include <xf86drm.h>
 
 #include "base/files/scoped_file.h"
 #include "base/posix/eintr_wrapper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/buffer_types.h"
-#include "ui/gl/gl_image_ozone_native_pixmap.h"
 #include "ui/gl/test/gl_image_test_template.h"
+#include "ui/ozone/gl/gl_image_ozone_native_pixmap.h"
 #include "ui/ozone/public/ozone_platform.h"
 #include "ui/ozone/public/surface_factory_ozone.h"
 
 namespace gl {
 namespace {
 
 // These values are picked so that RGB -> YVU on the CPU converted
 // back to RGB on the GPU produces the original RGB values without
 // any error.
 const uint8_t kImageColor[] = {0x10, 0x20, 0, 0xFF};
@@ skipping 75 matching lines @@
 // via exo.
 // TODO(dcastagna): once it's possible to allocate and map YV12 format
 // using Ozone merge this test with GLImageOzoneNativePixmapTestDelegate.
 class GLImageOzoneNativePixmapDrmTestDelegate {
  public:
   GLImageOzoneNativePixmapDrmTestDelegate() {}
   scoped_refptr<GLImage> CreateSolidColorImage(const gfx::Size& size,
                                                const uint8_t color[4]) const {
     scoped_refptr<ui::NativePixmap> pixmap = CreateYVU420Pixmap(size, color);
 
-    scoped_refptr<GLImageOzoneNativePixmap> image(
-        new GLImageOzoneNativePixmap(size, GL_RGB_YCRCB_420_CHROMIUM));
+    scoped_refptr<ui::GLImageOzoneNativePixmap> image(
+        new ui::GLImageOzoneNativePixmap(size, GL_RGB_YCRCB_420_CHROMIUM));
     EXPECT_TRUE(image->Initialize(pixmap.get(), pixmap->GetBufferFormat()));
     return image;
   }
 
   unsigned GetTextureTarget() const { return GL_TEXTURE_EXTERNAL_OES; }
 
   const uint8_t* GetImageColor() { return kImageColor; }
 
  private:
 };
 
 
 // TODO(crbug.com/618516) - The tests in this file can only be run
 // on a real device, and not on linux desktop builds, so they are
 // disabled until they can correctly detect the environment and do
 INSTANTIATE_TYPED_TEST_CASE_P(DISABLED_GLImageOzoneNativePixmapDrm,
                               GLImageTest,
                               GLImageOzoneNativePixmapDrmTestDelegate);
 
 INSTANTIATE_TYPED_TEST_CASE_P(DISABLED_GLImageOzoneNativePixmapDrm,
                               GLImageBindTest,
                               GLImageOzoneNativePixmapDrmTestDelegate);
 
 }  // namespace
 }  // namespace gl