Move client_native_pixmap_factory.h from ui/ozone/public to ui/gfx

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/gfx/client_native_pixmap.h"
 #include "ui/gl/gl_image_native_pixmap.h"
 #include "ui/gl/test/gl_image_test_template.h"
-#include "ui/ozone/public/client_native_pixmap.h"
-#include "ui/ozone/public/client_native_pixmap_factory.h"
+#include "ui/ozone/public/client_native_pixmap_factory_ozone.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 GLImageNativePixmapTestDelegate {
  public:
   GLImageNativePixmapTestDelegate() {
-    client_pixmap_factory_ = ui::ClientNativePixmapFactory::Create();
+    client_pixmap_factory_ = ui::CreateClientNativePixmapFactoryOzone();
   }
   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) {
@@ skipping 61 matching lines @@
 INSTANTIATE_TYPED_TEST_CASE_P(DISABLED_GLImageNativePixmapReadWrite,
                               GLImageTest,
                               GLImageReadWriteType);
 
 INSTANTIATE_TYPED_TEST_CASE_P(DISABLED_GLImageNativePixmap,
                               GLImageBindTest,
                               GLImageBindTestTypes);
 
 }  // namespace
 }  // namespace gl