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

ui/gfx/client_native_pixmap_factory.h

Index: ui/gfx/client_native_pixmap_factory.h
diff --git a/ui/ozone/public/client_native_pixmap_factory.h b/ui/gfx/client_native_pixmap_factory.h
similarity index 79%
rename from ui/ozone/public/client_native_pixmap_factory.h
rename to ui/gfx/client_native_pixmap_factory.h
index 1973656d36a94ed021b9f9ea0441b8a16ddffc66..67832bc1a8bdc56cfb9b120c32ff7ac6a3704b68 100644
--- a/ui/ozone/public/client_native_pixmap_factory.h
+++ b/ui/gfx/client_native_pixmap_factory.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PUBLIC_CLIENT_NATIVE_PIXMAP_FACTORY_H_
-#define UI_OZONE_PUBLIC_CLIENT_NATIVE_PIXMAP_FACTORY_H_
+#ifndef UI_GFX_CLIENT_NATIVE_PIXMAP_FACTORY_H_
+#define UI_GFX_CLIENT_NATIVE_PIXMAP_FACTORY_H_
 
 #include <memory>
 #include <vector>
@@ -11,8 +11,8 @@
 #include "base/files/scoped_file.h"
 #include "base/macros.h"
 #include "ui/gfx/buffer_types.h"
-#include "ui/ozone/ozone_export.h"
-#include "ui/ozone/public/client_native_pixmap.h"
+#include "ui/gfx/client_native_pixmap.h"
+#include "ui/gfx/gfx_export.h"
 
 namespace gfx {
 struct NativePixmapHandle;
@@ -23,13 +23,11 @@ namespace ui {
 
 // The Ozone interface allows external implementations to hook into Chromium to
 // provide a client pixmap for non-GPU processes.
-class OZONE_EXPORT ClientNativePixmapFactory {
+class GFX_EXPORT ClientNativePixmapFactory {
  public:
   static ClientNativePixmapFactory* GetInstance();
   static void SetInstance(ClientNativePixmapFactory* instance);
 
-  static std::unique_ptr<ClientNativePixmapFactory> Create();
-
   virtual ~ClientNativePixmapFactory();
 
   // Returns true if format/usage configuration is supported.
@@ -53,4 +51,4 @@ class OZONE_EXPORT ClientNativePixmapFactory {
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PUBLIC_CLIENT_NATIVE_PIXMAP_FACTORY_H_
+#endif  // UI_GFX_CLIENT_NATIVE_PIXMAP_FACTORY_H_