Rename GLImageOzoneNativePixmap to GLImageNativePixmap and move it from ui/ozone/gl to ui/gl

ui/gl/gl_image_native_pixmap.h

 // 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_OZONE_GL_GL_IMAGE_OZONE_NATIVE_PIXMAP_H_
-#define UI_OZONE_GL_GL_IMAGE_OZONE_NATIVE_PIXMAP_H_
+#ifndef UI_GL_GL_IMAGE_NATIVE_PIXMAP_H_
+#define UI_GL_GL_IMAGE_NATIVE_PIXMAP_H_
 
 #include <stdint.h>
 
 #include <string>
 
-#include "ui/gfx/buffer_types.h"
 #include "ui/gfx/native_pixmap.h"
+#include "ui/gl/gl_export.h"
 #include "ui/gl/gl_image_egl.h"
-#include "ui/ozone/gl/ozone_gl_export.h"
 
 namespace ui {

[Julien Isorce, 2017/03/22 17:33:52]

sadrul@, should I change namespace from ui to gl here ?

[sadrul, 2017/03/22 17:35:11]

Yes please.

 
-class OZONE_GL_EXPORT GLImageOzoneNativePixmap : public gl::GLImageEGL {
+class GL_EXPORT GLImageNativePixmap : public gl::GLImageEGL {
  public:
-  GLImageOzoneNativePixmap(const gfx::Size& size, unsigned internalformat);
+  GLImageNativePixmap(const gfx::Size& size, unsigned internalformat);
 
   bool Initialize(NativePixmap* pixmap, gfx::BufferFormat format);
 
   // Overridden from GLImage:
   unsigned GetInternalFormat() 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;
+  ~GLImageNativePixmap() override;
 
  private:
   unsigned internalformat_;
   scoped_refptr<NativePixmap> pixmap_;
   bool has_image_flush_external_;
 };
 
 }  // namespace ui
 
-#endif  // UI_OZONE_GL_GL_IMAGE_OZONE_NATIVE_PIXMAP_H_
+#endif  // UI_GL_GL_IMAGE_NATIVE_PIXMAP_H_