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

ui/ozone/gl/gl_image_ozone_native_pixmap.h

-// Copyright 2015 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef UI_GL_GL_IMAGE_OZONE_NATIVE_PIXMAP_H_
-#define UI_GL_GL_IMAGE_OZONE_NATIVE_PIXMAP_H_
+#ifndef UI_OZONE_GL_GL_IMAGE_OZONE_NATIVE_PIXMAP_H_
+#define UI_OZONE_GL_GL_IMAGE_OZONE_NATIVE_PIXMAP_H_
 
 #include <stdint.h>
 
+#include <string>
+
 #include "ui/gfx/buffer_types.h"
-#include "ui/gl/gl_export.h"
 #include "ui/gl/gl_image_egl.h"
+#include "ui/ozone/gl/ozone_gl_export.h"
 #include "ui/ozone/public/native_pixmap.h"
 
-namespace gl {
+namespace ui {
 
-class GL_EXPORT GLImageOzoneNativePixmap : public GLImageEGL {
+class OZONE_GL_EXPORT GLImageOzoneNativePixmap : public gl::GLImageEGL {
  public:
   GLImageOzoneNativePixmap(const gfx::Size& size, unsigned internalformat);
 
-  bool Initialize(ui::NativePixmap* pixmap, gfx::BufferFormat format);
+  bool Initialize(NativePixmap* pixmap, gfx::BufferFormat format);
 
   // Overridden from GLImage:
   unsigned GetInternalFormat() override;
   void Destroy(bool have_context) override;
   bool CopyTexImage(unsigned target) override;
   bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
                             int z_order,
                             gfx::OverlayTransform transform,
                             const gfx::Rect& bounds_rect,
                             const gfx::RectF& crop_rect) override;
   void Flush() override;
   void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd,
                     uint64_t process_tracing_id,
                     const std::string& dump_name) override;
 
   static unsigned GetInternalFormatForTesting(gfx::BufferFormat format);
 
  protected:
   ~GLImageOzoneNativePixmap() override;
 
  private:
   unsigned internalformat_;
-  scoped_refptr<ui::NativePixmap> pixmap_;
+  scoped_refptr<NativePixmap> pixmap_;
   bool has_image_flush_external_;
 };
 
-}  // namespace gl
+}  // namespace ui
 
-#endif  // UI_GL_GL_IMAGE_OZONE_NATIVE_PIXMAP_H_
+#endif  // UI_OZONE_GL_GL_IMAGE_OZONE_NATIVE_PIXMAP_H_