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

ui/ozone/public/client_native_pixmap_factory.cc

Index: ui/ozone/public/client_native_pixmap_factory.cc
diff --git a/ui/ozone/public/client_native_pixmap_factory.cc b/ui/ozone/public/client_native_pixmap_factory.cc
index 0db394ac004943e22408d84cec28a45e309069e4..76d3f554027b25a3762480a08978b807c8bcef3f 100644
--- a/ui/ozone/public/client_native_pixmap_factory.cc
+++ b/ui/ozone/public/client_native_pixmap_factory.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/public/client_native_pixmap_factory.h"
+#include "ui/gfx/client_native_pixmap_factory.h"
 
 #include "base/trace_event/trace_event.h"
 #include "ui/ozone/platform_object.h"
@@ -10,25 +10,6 @@
 
 namespace ui {
 
-namespace {
-
-ClientNativePixmapFactory* g_instance = nullptr;
-
-}  // namespace
-
-// static
-ClientNativePixmapFactory* ClientNativePixmapFactory::GetInstance() {
-  return g_instance;
-}
-
-// static
-void ClientNativePixmapFactory::SetInstance(
-    ClientNativePixmapFactory* instance) {
-  DCHECK(!g_instance);
-  DCHECK(instance);
-  g_instance = instance;
-}
-
 // static
 std::unique_ptr<ClientNativePixmapFactory> ClientNativePixmapFactory::Create() {
   TRACE_EVENT1("ozone", "ClientNativePixmapFactory::Create", "platform",
@@ -36,8 +17,4 @@ std::unique_ptr<ClientNativePixmapFactory> ClientNativePixmapFactory::Create() {
   return PlatformObject<ClientNativePixmapFactory>::Create();
 }
 
-ClientNativePixmapFactory::ClientNativePixmapFactory() {}
-
-ClientNativePixmapFactory::~ClientNativePixmapFactory() {}
-
 }  // namespace ui