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

ui/ozone/gl/gl_image_ozone_native_pixmap_unittest.cc

 // Copyright 2015 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 <stdint.h>
 
 #include <memory>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/buffer_types.h"
+#include "ui/gl/gl_image_native_pixmap.h"
 #include "ui/gl/test/gl_image_test_template.h"
-#include "ui/ozone/gl/gl_image_ozone_native_pixmap.h"
 #include "ui/ozone/public/client_native_pixmap.h"
 #include "ui/ozone/public/client_native_pixmap_factory.h"
 #include "ui/ozone/public/ozone_platform.h"
 #include "ui/ozone/public/surface_factory_ozone.h"
 
 namespace gl {
 namespace {
 
 const uint8_t kRed[] = {0xF0, 0x0, 0x0, 0xFF};
 const uint8_t kGreen[] = {0x0, 0xFF, 0x0, 0xFF};
 
 // These values are picked so that RGB -> YVU on the CPU converted
 // back to RGB on the GPU produces the original RGB values without
 // any error.
 const uint8_t kYvuColor[] = {0x10, 0x20, 0, 0xFF};
 
 template <gfx::BufferUsage usage, gfx::BufferFormat format>
-class GLImageOzoneNativePixmapTestDelegate {
+class GLImageNativePixmapTestDelegate {
  public:
-  GLImageOzoneNativePixmapTestDelegate() {
+  GLImageNativePixmapTestDelegate() {
     client_pixmap_factory_ = ui::ClientNativePixmapFactory::Create();
   }
   scoped_refptr<GLImage> CreateSolidColorImage(const gfx::Size& size,
                                                const uint8_t color[4]) const {
     ui::SurfaceFactoryOzone* surface_factory =
         ui::OzonePlatform::GetInstance()->GetSurfaceFactoryOzone();
     scoped_refptr<ui::NativePixmap> pixmap =
         surface_factory->CreateNativePixmap(gfx::kNullAcceleratedWidget, size,
                                             format, usage);
     DCHECK(pixmap);
     if (usage == gfx::BufferUsage::GPU_READ_CPU_READ_WRITE) {
       auto client_pixmap = client_pixmap_factory_->ImportFromHandle(
           pixmap->ExportHandle(), size, usage);
       bool mapped = client_pixmap->Map();
       EXPECT_TRUE(mapped);
 
       for (size_t plane = 0; plane < NumberOfPlanesForBufferFormat(format);
            ++plane) {
         void* data = client_pixmap->GetMemoryAddress(plane);
         GLImageTestSupport::SetBufferDataToColor(
             size.width(), size.height(), pixmap->GetDmaBufPitch(plane), plane,
             pixmap->GetBufferFormat(), color, static_cast<uint8_t*>(data));
       }
       client_pixmap->Unmap();
     }
 
-    scoped_refptr<ui::GLImageOzoneNativePixmap> image(
-        new ui::GLImageOzoneNativePixmap(
-            size,
-            ui::GLImageOzoneNativePixmap::GetInternalFormatForTesting(format)));
+    scoped_refptr<ui::GLImageNativePixmap> image(new ui::GLImageNativePixmap(
+        size, ui::GLImageNativePixmap::GetInternalFormatForTesting(format)));
     EXPECT_TRUE(image->Initialize(pixmap.get(), pixmap->GetBufferFormat()));
     return image;
   }
 
   unsigned GetTextureTarget() const { return GL_TEXTURE_EXTERNAL_OES; }
 
   const uint8_t* GetImageColor() {
     if (format == gfx::BufferFormat::R_8) {
       return kRed;
     } else if (format == gfx::BufferFormat::YVU_420) {
       return kYvuColor;
     }
     return kGreen;
   }
 
  private:
   std::unique_ptr<ui::ClientNativePixmapFactory> client_pixmap_factory_;
 };
 
 using GLImageScanoutType = testing::Types<
-    GLImageOzoneNativePixmapTestDelegate<gfx::BufferUsage::SCANOUT,
-                                         gfx::BufferFormat::BGRA_8888>>;
+    GLImageNativePixmapTestDelegate<gfx::BufferUsage::SCANOUT,
+                                    gfx::BufferFormat::BGRA_8888>>;
 
-INSTANTIATE_TYPED_TEST_CASE_P(GLImageOzoneNativePixmapScanout,
+INSTANTIATE_TYPED_TEST_CASE_P(GLImageNativePixmapScanout,
                               GLImageTest,
                               GLImageScanoutType);
 
-using GLImageReadWriteType =
-    testing::Types<GLImageOzoneNativePixmapTestDelegate<
-        gfx::BufferUsage::GPU_READ_CPU_READ_WRITE,
-        gfx::BufferFormat::R_8>>;
+using GLImageReadWriteType = testing::Types<
+    GLImageNativePixmapTestDelegate<gfx::BufferUsage::GPU_READ_CPU_READ_WRITE,
+                                    gfx::BufferFormat::R_8>>;
 
-using GLImageBindTestTypes =
-    testing::Types<GLImageOzoneNativePixmapTestDelegate<
-                       gfx::BufferUsage::GPU_READ_CPU_READ_WRITE,
-                       gfx::BufferFormat::BGRA_8888>,
-                   GLImageOzoneNativePixmapTestDelegate<
-                       gfx::BufferUsage::GPU_READ_CPU_READ_WRITE,
-                       gfx::BufferFormat::R_8>,
-                   GLImageOzoneNativePixmapTestDelegate<
-                       gfx::BufferUsage::GPU_READ_CPU_READ_WRITE,
-                       gfx::BufferFormat::YVU_420>,
-                   GLImageOzoneNativePixmapTestDelegate<
-                       gfx::BufferUsage::GPU_READ_CPU_READ_WRITE,
-                       gfx::BufferFormat::YUV_420_BIPLANAR>>;
+using GLImageBindTestTypes = testing::Types<
+    GLImageNativePixmapTestDelegate<gfx::BufferUsage::GPU_READ_CPU_READ_WRITE,
+                                    gfx::BufferFormat::BGRA_8888>,
+    GLImageNativePixmapTestDelegate<gfx::BufferUsage::GPU_READ_CPU_READ_WRITE,
+                                    gfx::BufferFormat::R_8>,
+    GLImageNativePixmapTestDelegate<gfx::BufferUsage::GPU_READ_CPU_READ_WRITE,
+                                    gfx::BufferFormat::YVU_420>,
+    GLImageNativePixmapTestDelegate<gfx::BufferUsage::GPU_READ_CPU_READ_WRITE,
+                                    gfx::BufferFormat::YUV_420_BIPLANAR>>;
 
 // These tests are disabled since the trybots are running with Ozone X11
 // implementation that doesn't support creating ClientNativePixmap.
 // TODO(dcastagna): Implement ClientNativePixmapFactory on Ozone X11.
-INSTANTIATE_TYPED_TEST_CASE_P(DISABLED_GLImageOzoneNativePixmapReadWrite,
+INSTANTIATE_TYPED_TEST_CASE_P(DISABLED_GLImageNativePixmapReadWrite,
                               GLImageTest,
                               GLImageReadWriteType);
 
-INSTANTIATE_TYPED_TEST_CASE_P(DISABLED_GLImageOzoneNativePixmap,
+INSTANTIATE_TYPED_TEST_CASE_P(DISABLED_GLImageNativePixmap,
                               GLImageBindTest,
                               GLImageBindTestTypes);
 
 }  // namespace
 }  // namespace gl