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

media/gpu/vaapi_drm_picture.cc

Index: media/gpu/vaapi_drm_picture.cc
diff --git a/media/gpu/vaapi_drm_picture.cc b/media/gpu/vaapi_drm_picture.cc
index 4d547df6ad930ae2e3c1d7130d2d4002e2ea2195..652d06b3aba103d81ace4990039857e6e7d330ad 100644
--- a/media/gpu/vaapi_drm_picture.cc
+++ b/media/gpu/vaapi_drm_picture.cc
@@ -10,8 +10,8 @@
 #include "third_party/libva/va/va.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 #include "ui/gl/gl_bindings.h"
-#include "ui/gl/gl_image_ozone_native_pixmap.h"
 #include "ui/gl/scoped_binders.h"
+#include "ui/ozone/gl/gl_image_ozone_native_pixmap.h"
 #include "ui/ozone/public/native_pixmap.h"
 #include "ui/ozone/public/ozone_platform.h"
 #include "ui/ozone/public/surface_factory_ozone.h"
@@ -61,8 +61,8 @@ bool VaapiDrmPicture::Initialize() {
 
     gl::ScopedTextureBinder texture_binder(GL_TEXTURE_EXTERNAL_OES,
                                            texture_id_);
-    scoped_refptr<gl::GLImageOzoneNativePixmap> image(
-        new gl::GLImageOzoneNativePixmap(size_, GL_BGRA_EXT));
+    scoped_refptr<ui::GLImageOzoneNativePixmap> image(
+        new ui::GLImageOzoneNativePixmap(size_, GL_BGRA_EXT));
     if (!image->Initialize(pixmap_.get(), pixmap_->GetBufferFormat())) {
       LOG(ERROR) << "Failed to create GLImage";
       return false;