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

services/ui/gles2/command_buffer_driver.cc

Index: services/ui/gles2/command_buffer_driver.cc
diff --git a/services/ui/gles2/command_buffer_driver.cc b/services/ui/gles2/command_buffer_driver.cc
index 00965fe63f3436d96e2a2d8aceb00602130076b1..559439690fbb02ee0934866c9b80a97e1ce876c2 100644
--- a/services/ui/gles2/command_buffer_driver.cc
+++ b/services/ui/gles2/command_buffer_driver.cc
@@ -35,7 +35,7 @@
 #include "ui/gl/init/gl_factory.h"
 
 #if defined(USE_OZONE)
-#include "ui/gl/gl_image_ozone_native_pixmap.h"
+#include "ui/ozone/gl/gl_image_ozone_native_pixmap.h"
 #endif
 
 namespace ui {
@@ -302,8 +302,8 @@ void CommandBufferDriver::CreateImageNativeOzone(int32_t id,
     return;
   }
 
-  scoped_refptr<gl::GLImageOzoneNativePixmap> image =
-      new gl::GLImageOzoneNativePixmap(size, internal_format);
+  scoped_refptr<ui::GLImageOzoneNativePixmap> image =
+      new ui::GLImageOzoneNativePixmap(size, internal_format);
   if (!image->Initialize(pixmap, format)) {
     NOTREACHED();
     return;