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

ui/ozone/gl/gl_image_ozone_native_pixmap_unittest.cc

Index: ui/ozone/gl/gl_image_ozone_native_pixmap_unittest.cc
diff --git a/ui/ozone/gl/gl_image_ozone_native_pixmap_unittest.cc b/ui/ozone/gl/gl_image_ozone_native_pixmap_unittest.cc
index 718749b0ae2c8099949e6f7183638db3ea35e83f..d538f85e301ca934a6dde24a002810b33dcb2bc6 100644
--- a/ui/ozone/gl/gl_image_ozone_native_pixmap_unittest.cc
+++ b/ui/ozone/gl/gl_image_ozone_native_pixmap_unittest.cc
@@ -8,10 +8,10 @@
 
 #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"
 
@@ -30,7 +30,7 @@ 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 {