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

ui/ozone/platform/drm/gpu/gbm_surface.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 "ui/ozone/platform/drm/gpu/gbm_surface.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "ui/gfx/native_pixmap.h"
+#include "ui/gl/gl_image_native_pixmap.h"
 #include "ui/gl/gl_surface_egl.h"
-#include "ui/ozone/gl/gl_image_ozone_native_pixmap.h"
 #include "ui/ozone/platform/drm/gpu/drm_window_proxy.h"
 #include "ui/ozone/platform/drm/gpu/gbm_surface_factory.h"
 
 namespace ui {
 
 GbmSurface::GbmSurface(GbmSurfaceFactory* surface_factory,
                        std::unique_ptr<DrmWindowProxy> window,
                        gfx::AcceleratedWidget widget)
     : GbmSurfaceless(surface_factory, std::move(window), widget) {
   for (auto& texture : textures_)
@@ skipping 97 matching lines @@
 
 bool GbmSurface::CreatePixmaps() {
   if (!fbo_)
     return true;
   for (size_t i = 0; i < arraysize(textures_); i++) {
     scoped_refptr<NativePixmap> pixmap = surface_factory()->CreateNativePixmap(
         widget(), GetSize(), gfx::BufferFormat::BGRA_8888,
         gfx::BufferUsage::SCANOUT);
     if (!pixmap)
       return false;
-    scoped_refptr<GLImageOzoneNativePixmap> image =
-        new GLImageOzoneNativePixmap(GetSize(), GL_BGRA_EXT);
+    scoped_refptr<GLImageNativePixmap> image =
+        new GLImageNativePixmap(GetSize(), GL_BGRA_EXT);
     if (!image->Initialize(pixmap.get(), gfx::BufferFormat::BGRA_8888))
       return false;
     images_[i] = image;
     // Bind image to texture.
     gl::ScopedTextureBinder binder(GL_TEXTURE_2D, textures_[i]);
     if (!images_[i]->BindTexImage(GL_TEXTURE_2D))
       return false;
   }
   return true;
 }
 
 }  // namespace ui